From 1d91736e5caaba4f5cbcfb91b782efa3c9599c05 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 8 Aug 2021 10:19:12 +0100 Subject: [PATCH 001/527] windows-build: Change trigger tag pattern to our "Release/*" --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 928708f4..0c04cd6f 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -3,7 +3,7 @@ name: Build EDMC for Windows on: push: tags: - - "v*" + - "Release/*" workflow_dispatch: jobs: From e7f8fea250b95e35d274c1a6f36b9dee4bab721d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 9 Aug 2021 14:02:41 +0100 Subject: [PATCH 002/527] github/windows-build: Create a post in "Announcements" for any Release --- .github/workflows/windows-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 0c04cd6f..e1041864 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -65,6 +65,7 @@ jobs: token: "${{secrets.GITHUB_TOKEN}}" draft: true prerelease: true + discussion_category_name: "Announcement" files: | ./EDMarketConnector_win*.msi ./hashes.sum From 7339cc59ede1a5a9c96f3a0fab8c23d5879b3eb8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 13:38:48 +0100 Subject: [PATCH 003/527] companion: Fix `class Session` docstring This is *not* only for the Frontier oAuth2 authn, it's also for the actual CAPI queries. --- companion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index 08c92b7d..4bf77bc6 100644 --- a/companion.py +++ b/companion.py @@ -464,7 +464,7 @@ class Auth(object): class Session(object): - """Methods for handling an oAuth2 session.""" + """Methods for handling Frontier Auth and CAPI queries.""" STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) @@ -553,7 +553,7 @@ class Session(object): self.session.headers['User-Agent'] = USER_AGENT self.state = Session.STATE_OK - def query(self, endpoint: str) -> CAPIData: # noqa: CCR001 + def query(self, endpoint: str) -> CAPIData: # noqa: CCR001, C901 """Perform a query against the specified CAPI endpoint.""" logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: From 81b5d015fdeecfcf2236a61c433d4c2dac929668 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 13:45:38 +0100 Subject: [PATCH 004/527] Frontier Auth: Rename `start()` method to something more obvious --- EDMarketConnector.py | 4 ++-- companion.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index ab893b50..c58e21f1 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -754,7 +754,7 @@ class AppWindow(object): journal_lock.update_lock(self.w) # (Re-)install log monitoring - if not monitor.start(self.w): + if not monitor.start_frontier_auth(self.w): # LANG: ED Journal file location appears to be in error self.status['text'] = _('Error: Check E:D journal file location') @@ -1222,7 +1222,7 @@ class AppWindow(object): logger.info('Monitor: Disable WinSparkle automatic update checks') # Can't start dashboard monitoring - if not dashboard.start(self.w, monitor.started): + if not dashboard.start_frontier_auth(self.w, monitor.started): logger.info("Can't start Status monitoring") # Export loadout diff --git a/companion.py b/companion.py index 4bf77bc6..8f0633c1 100644 --- a/companion.py +++ b/companion.py @@ -516,7 +516,7 @@ class Session(object): if access_token: logger.debug('We have an access_token') self.auth = None - self.start(access_token) + self.start_frontier_auth(access_token) return True else: @@ -536,7 +536,7 @@ class Session(object): try: logger.debug('Trying authorize with payload from handler') - self.start(self.auth.authorize(protocolhandler.lastpayload)) # type: ignore + self.start_frontier_auth(self.auth.authorize(protocolhandler.lastpayload)) # type: ignore self.auth = None except Exception: @@ -545,7 +545,7 @@ class Session(object): self.auth = None raise # Bad thing happened - def start(self, access_token: str) -> None: + def start_frontier_auth(self, access_token: str) -> None: """Start an oAuth2 session.""" logger.debug('Starting session') self.session = requests.Session() From c01438f77ef0c775e5dd3156bd63b37c53b02808 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 13:48:22 +0100 Subject: [PATCH 005/527] companion: Move start_frontier_auth() above login() The former will be used by the latter, so this makes more sense when reading the code. In general I'm going to ensure there are two sections to this Session class: 1. Frontier Auth code. 2. CAPI query code. Yes, ideally I'd split it into two classes. But that kind of refactoring isn't for *this* branch. I just want things straight in my head for the "make CAPI queries run in a thread" changes. --- companion.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/companion.py b/companion.py index 8f0633c1..c96b84d4 100644 --- a/companion.py +++ b/companion.py @@ -476,6 +476,14 @@ class Session(object): self.auth: Optional[Auth] = None self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query + def start_frontier_auth(self, access_token: str) -> None: + """Start an oAuth2 session.""" + logger.debug('Starting session') + self.session = requests.Session() + self.session.headers['Authorization'] = f'Bearer {access_token}' + self.session.headers['User-Agent'] = USER_AGENT + self.state = Session.STATE_OK + def login(self, cmdr: str = None, is_beta: Union[None, bool] = None) -> bool: """ Attempt oAuth2 login. @@ -545,14 +553,6 @@ class Session(object): self.auth = None raise # Bad thing happened - def start_frontier_auth(self, access_token: str) -> None: - """Start an oAuth2 session.""" - logger.debug('Starting session') - self.session = requests.Session() - self.session.headers['Authorization'] = f'Bearer {access_token}' - self.session.headers['User-Agent'] = USER_AGENT - self.state = Session.STATE_OK - def query(self, endpoint: str) -> CAPIData: # noqa: CCR001, C901 """Perform a query against the specified CAPI endpoint.""" logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') From d0e139123881f00c773c60ff8f41354dab7f2f1c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 13:52:33 +0100 Subject: [PATCH 006/527] companion: More function reordering, and comment-marking of sections The file has: 1a. class Session - Frontier Auth 1b. class Session - CAPI queries 1c. class Session - Utility functions (to do with CAPI query data, but not directly about *making* those queries. 2. Some non-class utility functions. --- companion.py | 54 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/companion.py b/companion.py index c96b84d4..28879cd7 100644 --- a/companion.py +++ b/companion.py @@ -476,6 +476,9 @@ class Session(object): self.auth: Optional[Auth] = None self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query + ###################################################################### + # Frontier Authorization + ###################################################################### def start_frontier_auth(self, access_token: str) -> None: """Start an oAuth2 session.""" logger.debug('Starting session') @@ -553,6 +556,29 @@ class Session(object): self.auth = None raise # Bad thing happened + def close(self) -> None: + """Close Frontier authorization session.""" + self.state = Session.STATE_INIT + if self.session: + try: + self.session.close() + + except Exception as e: + logger.debug('Frontier Auth: closing', exc_info=e) + + self.session = None + + def invalidate(self) -> None: + """Invalidate Frontier authorization credentials.""" + logger.debug('Forcing a full re-authentication') + # Force a full re-authentication + self.close() + Auth.invalidate(self.credentials['cmdr']) # type: ignore + ###################################################################### + + ###################################################################### + # CAPI queries + ###################################################################### def query(self, endpoint: str) -> CAPIData: # noqa: CCR001, C901 """Perform a query against the specified CAPI endpoint.""" logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') @@ -714,7 +740,11 @@ class Session(object): # WORKAROUND END return data + ###################################################################### + ###################################################################### + # Utility functions + ###################################################################### def suit_update(self, data: CAPIData) -> None: """ Update monitor.state suit data. @@ -752,25 +782,6 @@ class Session(object): else: monitor.state['SuitLoadouts'] = suit_loadouts - def close(self) -> None: - """Close CAPI authorization session.""" - self.state = Session.STATE_INIT - if self.session: - try: - self.session.close() - - except Exception as e: - logger.debug('Frontier CAPI Auth: closing', exc_info=e) - - self.session = None - - def invalidate(self) -> None: - """Invalidate oAuth2 credentials.""" - logger.debug('Forcing a full re-authentication') - # Force a full re-authentication - self.close() - Auth.invalidate(self.credentials['cmdr']) # type: ignore - # noinspection PyMethodMayBeStatic def dump(self, r: requests.Response) -> None: """Log, as error, status of requests.Response from CAPI request.""" @@ -802,8 +813,12 @@ class Session(object): indent=2, sort_keys=True, separators=(',', ': ')).encode('utf-8')) + ###################################################################### +###################################################################### +# Non-class utility functions +###################################################################### def fixup(data: CAPIData) -> CAPIData: # noqa: C901, CCR001 # Can't be usefully simplified """ Fix up commodity names to English & miscellaneous anomalies fixes. @@ -940,6 +955,7 @@ def index_possibly_sparse_list(data: Union[Mapping[str, V], List[V]], key: int) else: raise ValueError(f'Unexpected data type {type(data)}') +###################################################################### # singleton From bfaf66d8735a14413edf904aefa25c6028db3708 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 14:06:31 +0100 Subject: [PATCH 007/527] EDMarketConnector: Correct back to monitor.start() Bad PyCharm Refactor ! No Cookie! --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index c58e21f1..d1dee989 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -754,7 +754,7 @@ class AppWindow(object): journal_lock.update_lock(self.w) # (Re-)install log monitoring - if not monitor.start_frontier_auth(self.w): + if not monitor.start(self.w): # LANG: ED Journal file location appears to be in error self.status['text'] = _('Error: Check E:D journal file location') From c5af0a339779c49f5de5f873d30dba4d47d9c736 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 14:07:29 +0100 Subject: [PATCH 008/527] companion: Create CAPI worker thread on startup Confirmed to also *not* block shutdown currently --- companion.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/companion.py b/companion.py index 28879cd7..69b6e63d 100644 --- a/companion.py +++ b/companion.py @@ -14,6 +14,7 @@ import json import numbers import os import random +import threading import time import urllib.parse import webbrowser @@ -476,6 +477,15 @@ class Session(object): self.auth: Optional[Auth] = None self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query + logger.info('Starting CAPI queries thread...') + self.capi_query_thread = threading.Thread( + target=self.capi_query_worker, + daemon=True, + name='CAPI worker' + ) + self.capi_query_thread.start() + logger.info('Done') + ###################################################################### # Frontier Authorization ###################################################################### @@ -579,6 +589,18 @@ class Session(object): ###################################################################### # CAPI queries ###################################################################### + def capi_query_enqueue(self, endpoint: str) -> None: + """Request the worker thread perform a given endpoint query.""" + ... + + def capi_query_worker(self, ): + """Worker thread that performs actual CAPI queries.""" + logger.info('CAPI worker thread starting') + while True: + time.sleep(1) + + logger.info('CAPI worker thread DONE') + def query(self, endpoint: str) -> CAPIData: # noqa: CCR001, C901 """Perform a query against the specified CAPI endpoint.""" logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') From 9661d770cb6aa33525583854d66193c81510cfbc Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 14:20:32 +0100 Subject: [PATCH 009/527] companion: Implement, and use, asking CAPI thread to close down --- EDMarketConnector.py | 4 ++++ companion.py | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index d1dee989..0e6cc95c 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1577,6 +1577,10 @@ class AppWindow(object): logger.info('Unregistering hotkey manager...') hotkeymgr.unregister() + # Now the CAPI query thread + logger.info('Closing CAPI query thread...') + companion.session.capi_query_close_worker() + # Now the main programmatic input methods logger.info('Closing dashboard...') dashboard.close() diff --git a/companion.py b/companion.py index 69b6e63d..970f3e64 100644 --- a/companion.py +++ b/companion.py @@ -21,6 +21,7 @@ import webbrowser from builtins import object, range, str from email.utils import parsedate from os.path import join +from queue import Queue from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, OrderedDict, TypeVar, Union import requests @@ -478,6 +479,7 @@ class Session(object): self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query logger.info('Starting CAPI queries thread...') + self.capi_query_queue: Queue = Queue() self.capi_query_thread = threading.Thread( target=self.capi_query_worker, daemon=True, @@ -596,11 +598,22 @@ class Session(object): def capi_query_worker(self, ): """Worker thread that performs actual CAPI queries.""" logger.info('CAPI worker thread starting') + while True: + query: Optional[str] = self.capi_query_queue.get() + if not query: + logger.info('Empty queue message, exiting...') + break + + logger.trace_if('capi.worker', f'Processing query: {query}') time.sleep(1) logger.info('CAPI worker thread DONE') + def capi_query_close_worker(self) -> None: + """Ask the CAPI query thread to finish.""" + self.capi_query_queue.put(None) + def query(self, endpoint: str) -> CAPIData: # noqa: CCR001, C901 """Perform a query against the specified CAPI endpoint.""" logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') From 11916f1387fa394625ccf4df04ae613fb475f368 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 14:23:01 +0100 Subject: [PATCH 010/527] companion; Dummy CAPI worker enqueue to test code This properly triggered the logging in the worker thread --- companion.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/companion.py b/companion.py index 970f3e64..66d3440f 100644 --- a/companion.py +++ b/companion.py @@ -591,10 +591,6 @@ class Session(object): ###################################################################### # CAPI queries ###################################################################### - def capi_query_enqueue(self, endpoint: str) -> None: - """Request the worker thread perform a given endpoint query.""" - ... - def capi_query_worker(self, ): """Worker thread that performs actual CAPI queries.""" logger.info('CAPI worker thread starting') @@ -630,6 +626,7 @@ class Session(object): raise ServerConnectionError(f'Pretending CAPI down: {endpoint}') try: + self.capi_query_queue.put(endpoint) r = self.session.get(self.server + endpoint, timeout=timeout) # type: ignore except requests.ConnectionError as e: From 9c079c190d62a28b1ef514ee2f92aa12fd27db8d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 14:32:08 +0100 Subject: [PATCH 011/527] CAPI: Set up AppWindow handling of <> Tk event --- EDMarketConnector.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 0e6cc95c..447baea7 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -648,7 +648,8 @@ class AppWindow(object): self.w.bind('', self.onleave) # Special handling for transparency self.w.bind('', self.getandsend) self.w.bind('', self.getandsend) - self.w.bind_all('<>', self.getandsend) # Hotkey monitoring + self.w.bind_all('<>', self.getandsend) # Ask for CAPI queries to be performed + self.w.bind_all('<>', self.capi_handle_response) self.w.bind_all('<>', self.journal_event) # Journal monitoring self.w.bind_all('<>', self.dashboard_event) # Dashboard monitoring self.w.bind_all('<>', self.plugin_error) # Statusbar @@ -1089,6 +1090,10 @@ class AppWindow(object): self.suit_show_if_set() self.cooldown() + def capi_handle_response(self, event=None): + """Handle the resulting data from a CAPI query.""" + ... + def journal_event(self, event): # noqa: C901, CCR001 # Currently not easily broken up. """ Handle a Journal event passed through event queue from monitor.py. From e79d219657a89dbc1b5e944683e3ad5d323a74dc Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 14:33:46 +0100 Subject: [PATCH 012/527] CAPI: Rename AppWindow.getandsend() to be more obvious --- EDMarketConnector.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 447baea7..df80721d 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -485,8 +485,8 @@ class AppWindow(object): theme.register_alternate((self.button, self.theme_button, self.theme_button), {'row': ui_row, 'columnspan': 2, 'sticky': tk.NSEW}) self.status.grid(columnspan=2, sticky=tk.EW) - self.button.bind('', self.getandsend) - theme.button_bind(self.theme_button, self.getandsend) + self.button.bind('', self.capi_request_data) + theme.button_bind(self.theme_button, self.capi_request_data) for child in frame.winfo_children(): child.grid_configure(padx=self.PADX, pady=(platform != 'win32' or isinstance(child, tk.Frame)) and 2 or 0) @@ -646,9 +646,9 @@ class AppWindow(object): self.w.bind('', self.onenter) # Special handling for transparency self.w.bind('', self.onleave) # Special handling for transparency self.w.bind('', self.onleave) # Special handling for transparency - self.w.bind('', self.getandsend) - self.w.bind('', self.getandsend) - self.w.bind_all('<>', self.getandsend) # Ask for CAPI queries to be performed + self.w.bind('', self.capi_request_data) + self.w.bind('', self.capi_request_data) + self.w.bind_all('<>', self.capi_request_data) # Ask for CAPI queries to be performed self.w.bind_all('<>', self.capi_handle_response) self.w.bind_all('<>', self.journal_event) # Journal monitoring self.w.bind_all('<>', self.dashboard_event) # Dashboard monitoring @@ -887,7 +887,7 @@ class AppWindow(object): return True - def getandsend(self, event=None, retrying: bool = False): # noqa: C901, CCR001 + def capi_request_data(self, event=None, retrying: bool = False): # noqa: C901, CCR001 """ Perform CAPI data retrieval and associated actions. @@ -1060,7 +1060,7 @@ class AppWindow(object): else: # Retry once if Companion server is unresponsive - self.w.after(int(SERVER_RETRY * 1000), lambda: self.getandsend(event, True)) + self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event, True)) return # early exit to avoid starting cooldown count except companion.CmdrError as e: # Companion API return doesn't match Journal @@ -1269,7 +1269,7 @@ class AppWindow(object): auto_update = True if auto_update: - self.w.after(int(SERVER_RETRY * 1000), self.getandsend) + self.w.after(int(SERVER_RETRY * 1000), self.capi_request_data) if entry['event'] == 'ShutDown': # Enable WinSparkle automatic update checks From 2fc1568bf77886ad27d11ae0fbd2500e5fd60433 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 14:41:29 +0100 Subject: [PATCH 013/527] CAPI: Move CAPI response processing into AppWindow.capi_handle_response() --- EDMarketConnector.py | 69 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index df80721d..fb16422d 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -926,11 +926,14 @@ class AppWindow(object): self.button['state'] = self.theme_button['state'] = tk.DISABLED self.w.update_idletasks() - try: - querytime = int(time()) - data = companion.session.station() - config.set('querytime', querytime) + querytime = int(time()) + data = companion.session.station() + config.set('querytime', querytime) + + def capi_handle_response(self, event=None): + """Handle the resulting data from a CAPI query.""" + data = ... # Validation if 'commander' not in data: # This can happen with EGS Auth if no commander created yet @@ -1051,33 +1054,33 @@ class AppWindow(object): self.holdofftime = querytime + companion.holdoff - # Companion API problem - except companion.ServerLagging as e: - err = str(e) - if retrying: - self.status['text'] = err - play_bad = True - - else: - # Retry once if Companion server is unresponsive - self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event, True)) - return # early exit to avoid starting cooldown count - - except companion.CmdrError as e: # Companion API return doesn't match Journal - err = self.status['text'] = str(e) - play_bad = True - companion.session.invalidate() - self.login() - - except companion.ServerConnectionError as e: - logger.warning(f'Exception while contacting server: {e}') - err = self.status['text'] = str(e) - play_bad = True - - except Exception as e: # Including CredentialsError, ServerError - logger.debug('"other" exception', exc_info=e) - err = self.status['text'] = str(e) - play_bad = True +# # Companion API problem +# except companion.ServerLagging as e: +# err = str(e) +# if retrying: +# self.status['text'] = err +# play_bad = True +# +# else: +# # Retry once if Companion server is unresponsive +# self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event, True)) +# return # early exit to avoid starting cooldown count +# +# except companion.CmdrError as e: # Companion API return doesn't match Journal +# err = self.status['text'] = str(e) +# play_bad = True +# companion.session.invalidate() +# self.login() +# +# except companion.ServerConnectionError as e: +# logger.warning(f'Exception while contacting server: {e}') +# err = self.status['text'] = str(e) +# play_bad = True +# +# except Exception as e: # Including CredentialsError, ServerError +# logger.debug('"other" exception', exc_info=e) +# err = self.status['text'] = str(e) +# play_bad = True if not err: # not self.status['text']: # no errors # LANG: Time when we last obtained Frontier CAPI data @@ -1090,10 +1093,6 @@ class AppWindow(object): self.suit_show_if_set() self.cooldown() - def capi_handle_response(self, event=None): - """Handle the resulting data from a CAPI query.""" - ... - def journal_event(self, event): # noqa: C901, CCR001 # Currently not easily broken up. """ Handle a Journal event passed through event queue from monitor.py. From 655c7ea1ca9b677013d372efedbec6f279ac983f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 15:37:55 +0100 Subject: [PATCH 014/527] CAPI: Some progress in using a Queue to signal result/error Due to main app being Tk we can't just use Python async functionality. So instead we have a class to hold a message and optional exception. And instance of that goes into a queue. The reading of that in the main thread is triggered by sending a Tk event. Much more to come. --- EDMarketConnector.py | 210 +++++++++++++++++++++++-------------------- companion.py | 102 +++++++++++++-------- 2 files changed, 179 insertions(+), 133 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index fb16422d..3b06bfdf 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -7,6 +7,7 @@ import html import json import locale import pathlib +import queue import re import sys # import threading @@ -14,6 +15,7 @@ import webbrowser from builtins import object, str from os import chdir, environ from os.path import dirname, join +from queue import Queue from sys import platform from time import localtime, strftime, time from typing import TYPE_CHECKING, Optional, Tuple @@ -384,6 +386,8 @@ class AppWindow(object): def __init__(self, master: tk.Tk): # noqa: C901, CCR001 # TODO - can possibly factor something out self.holdofftime = config.get_int('querytime', default=0) + companion.holdoff + self.capi_response_queue: Queue = Queue() + companion.session.set_capi_response_queue(self.capi_response_queue) self.w = master self.w.title(applongname) @@ -933,126 +937,138 @@ class AppWindow(object): def capi_handle_response(self, event=None): """Handle the resulting data from a CAPI query.""" - data = ... - # Validation - if 'commander' not in data: - # This can happen with EGS Auth if no commander created yet - # LANG: No data was returned for the commander from the Frontier CAPI - err = self.status['text'] = _('CAPI: No commander data returned') + try: + data = self.capi_response_queue.get(block=False) - elif not data.get('commander', {}).get('name'): - # LANG: We didn't have the commander name when we should have - err = self.status['text'] = _("Who are you?!") # Shouldn't happen + except queue.Empty: + logger.error('There was no response in the queue!') + # TODO: Set status text + return - elif (not data.get('lastSystem', {}).get('name') - or (data['commander'].get('docked') - and not data.get('lastStarport', {}).get('name'))): - # LANG: We don't know where the commander is, when we should - err = self.status['text'] = _("Where are you?!") # Shouldn't happen + else: + if isinstance(data, companion.CAPIFailedRequest): + logger.trace_if('capi.worker', f'Failed Request: {data.message}') + raise data.exception - elif not data.get('ship', {}).get('name') or not data.get('ship', {}).get('modules'): - # LANG: We don't know what ship the commander is in, when we should - err = self.status['text'] = _("What are you flying?!") # Shouldn't happen + # Validation + if 'commander' not in data: + # This can happen with EGS Auth if no commander created yet + # LANG: No data was returned for the commander from the Frontier CAPI + err = self.status['text'] = _('CAPI: No commander data returned') - elif monitor.cmdr and data['commander']['name'] != monitor.cmdr: - # Companion API Commander doesn't match Journal - raise companion.CmdrError() + elif not data.get('commander', {}).get('name'): + # LANG: We didn't have the commander name when we should have + err = self.status['text'] = _("Who are you?!") # Shouldn't happen - elif auto_update and not monitor.state['OnFoot'] and not data['commander'].get('docked'): - # auto update is only when just docked - logger.warning(f"{auto_update!r} and not {monitor.state['OnFoot']!r} and " - f"not {data['commander'].get('docked')!r}") - raise companion.ServerLagging() + elif (not data.get('lastSystem', {}).get('name') + or (data['commander'].get('docked') + and not data.get('lastStarport', {}).get('name'))): + # LANG: We don't know where the commander is, when we should + err = self.status['text'] = _("Where are you?!") # Shouldn't happen - elif data['lastSystem']['name'] != monitor.system: - # CAPI system must match last journal one - logger.warning(f"{data['lastSystem']['name']!r} != {monitor.system!r}") - raise companion.ServerLagging() + elif not data.get('ship', {}).get('name') or not data.get('ship', {}).get('modules'): + # LANG: We don't know what ship the commander is in, when we should + err = self.status['text'] = _("What are you flying?!") # Shouldn't happen - elif data['lastStarport']['name'] != monitor.station: - if monitor.state['OnFoot'] and monitor.station: - logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " - f"{monitor.state['OnFoot']!r} and {monitor.station!r}") - raise companion.ServerLagging() + elif monitor.cmdr and data['commander']['name'] != monitor.cmdr: + # Companion API Commander doesn't match Journal + raise companion.CmdrError() - else: - last_station = None - if data['commander']['docked']: - last_station = data['lastStarport']['name'] + elif auto_update and not monitor.state['OnFoot'] and not data['commander'].get('docked'): + # auto update is only when just docked + logger.warning(f"{auto_update!r} and not {monitor.state['OnFoot']!r} and " + f"not {data['commander'].get('docked')!r}") + raise companion.ServerLagging() - if monitor.station is None: - # Likely (re-)Embarked on ship docked at an EDO settlement. - # Both Disembark and Embark have `"Onstation": false` in Journal. - # So there's nothing to tell us which settlement we're (still, - # or now, if we came here in Apex and then recalled ship) docked at. - logger.debug("monitor.station is None - so EDO settlement?") - raise companion.NoMonitorStation() + elif data['lastSystem']['name'] != monitor.system: + # CAPI system must match last journal one + logger.warning(f"{data['lastSystem']['name']!r} != {monitor.system!r}") + raise companion.ServerLagging() - if last_station != monitor.station: - # CAPI lastStarport must match - logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " - f"{last_station!r} != {monitor.station!r}") - raise companion.ServerLagging() - - self.holdofftime = querytime + companion.holdoff - - elif not monitor.state['OnFoot'] and data['ship']['id'] != monitor.state['ShipID']: - # CAPI ship must match - logger.warning(f"not {monitor.state['OnFoot']!r} and " - f"{data['ship']['id']!r} != {monitor.state['ShipID']!r}") - raise companion.ServerLagging() - - elif not monitor.state['OnFoot'] and data['ship']['name'].lower() != monitor.state['ShipType']: - # CAPI ship type must match - logger.warning(f"not {monitor.state['OnFoot']!r} and " - f"{data['ship']['name'].lower()!r} != {monitor.state['ShipType']!r}") + elif data['lastStarport']['name'] != monitor.station: + if monitor.state['OnFoot'] and monitor.station: + logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " + f"{monitor.state['OnFoot']!r} and {monitor.station!r}") raise companion.ServerLagging() else: - if __debug__: # Recording - companion.session.dump_capi_data(data) + last_station = None + if data['commander']['docked']: + last_station = data['lastStarport']['name'] - if not monitor.state['ShipType']: # Started game in SRV or fighter - self.ship['text'] = ship_name_map.get(data['ship']['name'].lower(), data['ship']['name']) - monitor.state['ShipID'] = data['ship']['id'] - monitor.state['ShipType'] = data['ship']['name'].lower() + if monitor.station is None: + # Likely (re-)Embarked on ship docked at an EDO settlement. + # Both Disembark and Embark have `"Onstation": false` in Journal. + # So there's nothing to tell us which settlement we're (still, + # or now, if we came here in Apex and then recalled ship) docked at. + logger.debug("monitor.station is None - so EDO settlement?") + raise companion.NoMonitorStation() - if not monitor.state['Modules']: - self.ship.configure(state=tk.DISABLED) + if last_station != monitor.station: + # CAPI lastStarport must match + logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " + f"{last_station!r} != {monitor.station!r}") + raise companion.ServerLagging() - # We might have disabled this in the conditional above. - if monitor.state['Modules']: - self.ship.configure(state=True) + self.holdofftime = querytime + companion.holdoff - if monitor.state.get('SuitCurrent') is not None: - if (loadout := data.get('loadout')) is not None: - if (suit := loadout.get('suit')) is not None: - if (suitname := suit.get('edmcName')) is not None: - # We've been paranoid about loadout->suit->suitname, now just assume loadouts is there - loadout_name = index_possibly_sparse_list( - data['loadouts'], loadout['loadoutSlotId'] - )['name'] + elif not monitor.state['OnFoot'] and data['ship']['id'] != monitor.state['ShipID']: + # CAPI ship must match + logger.warning(f"not {monitor.state['OnFoot']!r} and " + f"{data['ship']['id']!r} != {monitor.state['ShipID']!r}") + raise companion.ServerLagging() - self.suit['text'] = f'{suitname} ({loadout_name})' + elif not monitor.state['OnFoot'] and data['ship']['name'].lower() != monitor.state['ShipType']: + # CAPI ship type must match + logger.warning(f"not {monitor.state['OnFoot']!r} and " + f"{data['ship']['name'].lower()!r} != {monitor.state['ShipType']!r}") + raise companion.ServerLagging() - self.suit_show_if_set() + else: + if __debug__: # Recording + companion.session.dump_capi_data(data) - if data['commander'].get('credits') is not None: - monitor.state['Credits'] = data['commander']['credits'] - monitor.state['Loan'] = data['commander'].get('debt', 0) + if not monitor.state['ShipType']: # Started game in SRV or fighter + self.ship['text'] = ship_name_map.get(data['ship']['name'].lower(), data['ship']['name']) + monitor.state['ShipID'] = data['ship']['id'] + monitor.state['ShipType'] = data['ship']['name'].lower() - # stuff we can do when not docked - err = plug.notify_newdata(data, monitor.is_beta) - self.status['text'] = err and err or '' - if err: - play_bad = True + if not monitor.state['Modules']: + self.ship.configure(state=tk.DISABLED) - # Export market data - if not self.export_market_data(data): - err = 'Error: Exporting Market data' - play_bad = True + # We might have disabled this in the conditional above. + if monitor.state['Modules']: + self.ship.configure(state=True) - self.holdofftime = querytime + companion.holdoff + if monitor.state.get('SuitCurrent') is not None: + if (loadout := data.get('loadout')) is not None: + if (suit := loadout.get('suit')) is not None: + if (suitname := suit.get('edmcName')) is not None: + # We've been paranoid about loadout->suit->suitname, now just assume loadouts is there + loadout_name = index_possibly_sparse_list( + data['loadouts'], loadout['loadoutSlotId'] + )['name'] + + self.suit['text'] = f'{suitname} ({loadout_name})' + + self.suit_show_if_set() + + if data['commander'].get('credits') is not None: + monitor.state['Credits'] = data['commander']['credits'] + monitor.state['Loan'] = data['commander'].get('debt', 0) + + # stuff we can do when not docked + err = plug.notify_newdata(data, monitor.is_beta) + self.status['text'] = err and err or '' + if err: + play_bad = True + + # Export market data + if not self.export_market_data(data): + err = 'Error: Exporting Market data' + play_bad = True + + self.holdofftime = querytime + companion.holdoff # # Companion API problem # except companion.ServerLagging as e: diff --git a/companion.py b/companion.py index 66d3440f..d1177a31 100644 --- a/companion.py +++ b/companion.py @@ -15,6 +15,7 @@ import numbers import os import random import threading +import tkinter as tk import time import urllib.parse import webbrowser @@ -465,6 +466,13 @@ class Auth(object): return base64.urlsafe_b64encode(text).decode().replace('=', '') +class CAPIFailedRequest(): + """CAPI failed query error class.""" + + def __init__(self, message, exception=None): + self.message = message + self.exception = exception + class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" @@ -477,8 +485,10 @@ class Session(object): self.session: Optional[requests.Session] = None self.auth: Optional[Auth] = None self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query + self.tk_master: Optional[tk.Tk] = None logger.info('Starting CAPI queries thread...') + self.capi_response_queue: Queue self.capi_query_queue: Queue = Queue() self.capi_query_thread = threading.Thread( target=self.capi_query_worker, @@ -488,6 +498,12 @@ class Session(object): self.capi_query_thread.start() logger.info('Done') + def set_capi_response_queue(self, capi_response_queue: Queue) -> None: + self.capi_response_queue = capi_response_queue + + def set_tk_master(self, master: tk.Tk) -> None: + self.tk_master = master + ###################################################################### # Frontier Authorization ###################################################################### @@ -591,18 +607,61 @@ class Session(object): ###################################################################### # CAPI queries ###################################################################### - def capi_query_worker(self, ): + def capi_query_worker(self): """Worker thread that performs actual CAPI queries.""" logger.info('CAPI worker thread starting') while True: - query: Optional[str] = self.capi_query_queue.get() - if not query: + endpoint: Optional[str] = self.capi_query_queue.get() + if not endpoint: logger.info('Empty queue message, exiting...') break - logger.trace_if('capi.worker', f'Processing query: {query}') - time.sleep(1) + logger.trace_if('capi.worker', f'Processing query: {endpoint}') + # XXX + self.capi_response_queue.put( + CAPIFailedRequest(f'Unable to connect to endpoint {endpoint}') + ) + self.tk_master.event_generate('<>') + continue + # XXX + try: + r = self.session.get(self.server + endpoint, timeout=timeout) # type: ignore + r.raise_for_status() # Typically 403 "Forbidden" on token expiry + data = CAPIData(r.json(), endpoint) # May also fail here if token expired since response is empty + + except requests.ConnectionError as e: + logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {endpoint})') + self.capi_response_queue.put( + CAPIFailedRequest(f'Unable to connect to endpoint {endpoint}', exception=e) + ) + continue + # raise ServerConnectionError(f'Unable to connect to endpoint {endpoint}') from e + + except Exception as e: + logger.debug('Attempting GET', exc_info=e) + # LANG: Frontier CAPI data retrieval failed + # raise ServerError(f'{_("Frontier CAPI query failure")}: {endpoint}') from e + self.capi_response_queue.put( + CAPIFailedRequest(f'Frontier CAPI query failure: {endpoint}', exception=e) + ) + continue + + if r.url.startswith(SERVER_AUTH): + logger.info('Redirected back to Auth Server') + # Redirected back to Auth server - force full re-authentication + self.dump(r) + self.invalidate() + self.retrying = False + self.login() + raise CredentialsError() + + elif 500 <= r.status_code < 600: + # Server error. Typically 500 "Internal Server Error" if server is down + logger.debug('500 status back from CAPI') + self.dump(r) + # LANG: Frontier CAPI data retrieval failed with 5XX code + raise ServerError(f'{_("Frontier CAPI server error")}: {r.status_code}') logger.info('CAPI worker thread DONE') @@ -625,38 +684,9 @@ class Session(object): if conf_module.capi_pretend_down: raise ServerConnectionError(f'Pretending CAPI down: {endpoint}') + self.capi_query_queue.put(endpoint) try: - self.capi_query_queue.put(endpoint) - r = self.session.get(self.server + endpoint, timeout=timeout) # type: ignore - - except requests.ConnectionError as e: - logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {endpoint})') - raise ServerConnectionError(f'Unable to connect to endpoint {endpoint}') from e - - except Exception as e: - logger.debug('Attempting GET', exc_info=e) - # LANG: Frontier CAPI data retrieval failed - raise ServerError(f'{_("Frontier CAPI query failure")}: {endpoint}') from e - - if r.url.startswith(SERVER_AUTH): - logger.info('Redirected back to Auth Server') - # Redirected back to Auth server - force full re-authentication - self.dump(r) - self.invalidate() - self.retrying = False - self.login() - raise CredentialsError() - - elif 500 <= r.status_code < 600: - # Server error. Typically 500 "Internal Server Error" if server is down - logger.debug('500 status back from CAPI') - self.dump(r) - # LANG: Frontier CAPI data retrieval failed with 5XX code - raise ServerError(f'{_("Frontier CAPI server error")}: {r.status_code}') - - try: - r.raise_for_status() # Typically 403 "Forbidden" on token expiry - data = CAPIData(r.json(), endpoint) # May also fail here if token expired since response is empty + ... except (requests.HTTPError, ValueError) as e: logger.exception('Frontier CAPI Auth: GET ') From 407bc9f53a3034346b7657cba0b76fe7914ee613 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 15:42:13 +0100 Subject: [PATCH 015/527] CAPI: Set companion.Session.tk_master ASAP from AppWindow --- EDMarketConnector.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 3b06bfdf..9dba289b 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -394,6 +394,9 @@ class AppWindow(object): self.w.rowconfigure(0, weight=1) self.w.columnconfigure(0, weight=1) + # companion needs to be able to send <> events + companion.session.set_tk_master(self.w) + self.prefsdialog = None # if platform == 'win32': From 7f362be740a56599d08943a946d39bd287c7ffac Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 15:50:25 +0100 Subject: [PATCH 016/527] CAPI: Reinstate/format post-query exceptions/etc in AppWindow --- EDMarketConnector.py | 260 ++++++++++++++++++++++--------------------- 1 file changed, 131 insertions(+), 129 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 9dba289b..ca30c484 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -942,164 +942,166 @@ class AppWindow(object): """Handle the resulting data from a CAPI query.""" try: data = self.capi_response_queue.get(block=False) - - except queue.Empty: - logger.error('There was no response in the queue!') - # TODO: Set status text - return - - else: if isinstance(data, companion.CAPIFailedRequest): logger.trace_if('capi.worker', f'Failed Request: {data.message}') - raise data.exception + if data.exception: + raise data.exception - # Validation - if 'commander' not in data: - # This can happen with EGS Auth if no commander created yet - # LANG: No data was returned for the commander from the Frontier CAPI - err = self.status['text'] = _('CAPI: No commander data returned') + else: + raise ValueError(data.message) - elif not data.get('commander', {}).get('name'): - # LANG: We didn't have the commander name when we should have - err = self.status['text'] = _("Who are you?!") # Shouldn't happen + # Validation + if 'commander' not in data: + # This can happen with EGS Auth if no commander created yet + # LANG: No data was returned for the commander from the Frontier CAPI + err = self.status['text'] = _('CAPI: No commander data returned') - elif (not data.get('lastSystem', {}).get('name') - or (data['commander'].get('docked') - and not data.get('lastStarport', {}).get('name'))): - # LANG: We don't know where the commander is, when we should - err = self.status['text'] = _("Where are you?!") # Shouldn't happen + elif not data.get('commander', {}).get('name'): + # LANG: We didn't have the commander name when we should have + err = self.status['text'] = _("Who are you?!") # Shouldn't happen - elif not data.get('ship', {}).get('name') or not data.get('ship', {}).get('modules'): - # LANG: We don't know what ship the commander is in, when we should - err = self.status['text'] = _("What are you flying?!") # Shouldn't happen + elif (not data.get('lastSystem', {}).get('name') + or (data['commander'].get('docked') + and not data.get('lastStarport', {}).get('name'))): + # LANG: We don't know where the commander is, when we should + err = self.status['text'] = _("Where are you?!") # Shouldn't happen - elif monitor.cmdr and data['commander']['name'] != monitor.cmdr: - # Companion API Commander doesn't match Journal - raise companion.CmdrError() + elif not data.get('ship', {}).get('name') or not data.get('ship', {}).get('modules'): + # LANG: We don't know what ship the commander is in, when we should + err = self.status['text'] = _("What are you flying?!") # Shouldn't happen - elif auto_update and not monitor.state['OnFoot'] and not data['commander'].get('docked'): - # auto update is only when just docked - logger.warning(f"{auto_update!r} and not {monitor.state['OnFoot']!r} and " - f"not {data['commander'].get('docked')!r}") - raise companion.ServerLagging() + elif monitor.cmdr and data['commander']['name'] != monitor.cmdr: + # Companion API Commander doesn't match Journal + raise companion.CmdrError() - elif data['lastSystem']['name'] != monitor.system: - # CAPI system must match last journal one - logger.warning(f"{data['lastSystem']['name']!r} != {monitor.system!r}") - raise companion.ServerLagging() + elif auto_update and not monitor.state['OnFoot'] and not data['commander'].get('docked'): + # auto update is only when just docked + logger.warning(f"{auto_update!r} and not {monitor.state['OnFoot']!r} and " + f"not {data['commander'].get('docked')!r}") + raise companion.ServerLagging() - elif data['lastStarport']['name'] != monitor.station: - if monitor.state['OnFoot'] and monitor.station: - logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " - f"{monitor.state['OnFoot']!r} and {monitor.station!r}") + elif data['lastSystem']['name'] != monitor.system: + # CAPI system must match last journal one + logger.warning(f"{data['lastSystem']['name']!r} != {monitor.system!r}") + raise companion.ServerLagging() + + elif data['lastStarport']['name'] != monitor.station: + if monitor.state['OnFoot'] and monitor.station: + logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " + f"{monitor.state['OnFoot']!r} and {monitor.station!r}") + raise companion.ServerLagging() + + else: + last_station = None + if data['commander']['docked']: + last_station = data['lastStarport']['name'] + + if monitor.station is None: + # Likely (re-)Embarked on ship docked at an EDO settlement. + # Both Disembark and Embark have `"Onstation": false` in Journal. + # So there's nothing to tell us which settlement we're (still, + # or now, if we came here in Apex and then recalled ship) docked at. + logger.debug("monitor.station is None - so EDO settlement?") + raise companion.NoMonitorStation() + + if last_station != monitor.station: + # CAPI lastStarport must match + logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " + f"{last_station!r} != {monitor.station!r}") + raise companion.ServerLagging() + + self.holdofftime = querytime + companion.holdoff + + elif not monitor.state['OnFoot'] and data['ship']['id'] != monitor.state['ShipID']: + # CAPI ship must match + logger.warning(f"not {monitor.state['OnFoot']!r} and " + f"{data['ship']['id']!r} != {monitor.state['ShipID']!r}") + raise companion.ServerLagging() + + elif not monitor.state['OnFoot'] and data['ship']['name'].lower() != monitor.state['ShipType']: + # CAPI ship type must match + logger.warning(f"not {monitor.state['OnFoot']!r} and " + f"{data['ship']['name'].lower()!r} != {monitor.state['ShipType']!r}") raise companion.ServerLagging() else: - last_station = None - if data['commander']['docked']: - last_station = data['lastStarport']['name'] + if __debug__: # Recording + companion.session.dump_capi_data(data) - if monitor.station is None: - # Likely (re-)Embarked on ship docked at an EDO settlement. - # Both Disembark and Embark have `"Onstation": false` in Journal. - # So there's nothing to tell us which settlement we're (still, - # or now, if we came here in Apex and then recalled ship) docked at. - logger.debug("monitor.station is None - so EDO settlement?") - raise companion.NoMonitorStation() + if not monitor.state['ShipType']: # Started game in SRV or fighter + self.ship['text'] = ship_name_map.get(data['ship']['name'].lower(), data['ship']['name']) + monitor.state['ShipID'] = data['ship']['id'] + monitor.state['ShipType'] = data['ship']['name'].lower() - if last_station != monitor.station: - # CAPI lastStarport must match - logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " - f"{last_station!r} != {monitor.station!r}") - raise companion.ServerLagging() + if not monitor.state['Modules']: + self.ship.configure(state=tk.DISABLED) - self.holdofftime = querytime + companion.holdoff + # We might have disabled this in the conditional above. + if monitor.state['Modules']: + self.ship.configure(state=True) - elif not monitor.state['OnFoot'] and data['ship']['id'] != monitor.state['ShipID']: - # CAPI ship must match - logger.warning(f"not {monitor.state['OnFoot']!r} and " - f"{data['ship']['id']!r} != {monitor.state['ShipID']!r}") - raise companion.ServerLagging() + if monitor.state.get('SuitCurrent') is not None: + if (loadout := data.get('loadout')) is not None: + if (suit := loadout.get('suit')) is not None: + if (suitname := suit.get('edmcName')) is not None: + # We've been paranoid about loadout->suit->suitname, now just assume loadouts is there + loadout_name = index_possibly_sparse_list( + data['loadouts'], loadout['loadoutSlotId'] + )['name'] - elif not monitor.state['OnFoot'] and data['ship']['name'].lower() != monitor.state['ShipType']: - # CAPI ship type must match - logger.warning(f"not {monitor.state['OnFoot']!r} and " - f"{data['ship']['name'].lower()!r} != {monitor.state['ShipType']!r}") - raise companion.ServerLagging() + self.suit['text'] = f'{suitname} ({loadout_name})' - else: - if __debug__: # Recording - companion.session.dump_capi_data(data) + self.suit_show_if_set() - if not monitor.state['ShipType']: # Started game in SRV or fighter - self.ship['text'] = ship_name_map.get(data['ship']['name'].lower(), data['ship']['name']) - monitor.state['ShipID'] = data['ship']['id'] - monitor.state['ShipType'] = data['ship']['name'].lower() + if data['commander'].get('credits') is not None: + monitor.state['Credits'] = data['commander']['credits'] + monitor.state['Loan'] = data['commander'].get('debt', 0) - if not monitor.state['Modules']: - self.ship.configure(state=tk.DISABLED) + # stuff we can do when not docked + err = plug.notify_newdata(data, monitor.is_beta) + self.status['text'] = err and err or '' + if err: + play_bad = True - # We might have disabled this in the conditional above. - if monitor.state['Modules']: - self.ship.configure(state=True) + # Export market data + if not self.export_market_data(data): + err = 'Error: Exporting Market data' + play_bad = True - if monitor.state.get('SuitCurrent') is not None: - if (loadout := data.get('loadout')) is not None: - if (suit := loadout.get('suit')) is not None: - if (suitname := suit.get('edmcName')) is not None: - # We've been paranoid about loadout->suit->suitname, now just assume loadouts is there - loadout_name = index_possibly_sparse_list( - data['loadouts'], loadout['loadoutSlotId'] - )['name'] + self.holdofftime = querytime + companion.holdoff - self.suit['text'] = f'{suitname} ({loadout_name})' + except queue.Empty: + logger.error('There was no response in the queue!') + # TODO: Set status text + return - self.suit_show_if_set() - - if data['commander'].get('credits') is not None: - monitor.state['Credits'] = data['commander']['credits'] - monitor.state['Loan'] = data['commander'].get('debt', 0) - - # stuff we can do when not docked - err = plug.notify_newdata(data, monitor.is_beta) - self.status['text'] = err and err or '' - if err: + # Companion API problem + except companion.ServerLagging as e: + err = str(e) + if retrying: + self.status['text'] = err play_bad = True - # Export market data - if not self.export_market_data(data): - err = 'Error: Exporting Market data' - play_bad = True + else: + # Retry once if Companion server is unresponsive + self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event, True)) + return # early exit to avoid starting cooldown count - self.holdofftime = querytime + companion.holdoff + except companion.CmdrError as e: # Companion API return doesn't match Journal + err = self.status['text'] = str(e) + play_bad = True + companion.session.invalidate() + self.login() -# # Companion API problem -# except companion.ServerLagging as e: -# err = str(e) -# if retrying: -# self.status['text'] = err -# play_bad = True -# -# else: -# # Retry once if Companion server is unresponsive -# self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event, True)) -# return # early exit to avoid starting cooldown count -# -# except companion.CmdrError as e: # Companion API return doesn't match Journal -# err = self.status['text'] = str(e) -# play_bad = True -# companion.session.invalidate() -# self.login() -# -# except companion.ServerConnectionError as e: -# logger.warning(f'Exception while contacting server: {e}') -# err = self.status['text'] = str(e) -# play_bad = True -# -# except Exception as e: # Including CredentialsError, ServerError -# logger.debug('"other" exception', exc_info=e) -# err = self.status['text'] = str(e) -# play_bad = True + except companion.ServerConnectionError as e: + logger.warning(f'Exception while contacting server: {e}') + err = self.status['text'] = str(e) + play_bad = True + + except Exception as e: # Including CredentialsError, ServerError + logger.debug('"other" exception', exc_info=e) + err = self.status['text'] = str(e) + play_bad = True if not err: # not self.status['text']: # no errors # LANG: Time when we last obtained Frontier CAPI data From ce02cfdf2d6cce2bf45619dc620b1028442668d2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 15:57:24 +0100 Subject: [PATCH 017/527] CAPI: Remove "test failure propogration" forced error --- companion.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/companion.py b/companion.py index d1177a31..7c67a892 100644 --- a/companion.py +++ b/companion.py @@ -618,13 +618,6 @@ class Session(object): break logger.trace_if('capi.worker', f'Processing query: {endpoint}') - # XXX - self.capi_response_queue.put( - CAPIFailedRequest(f'Unable to connect to endpoint {endpoint}') - ) - self.tk_master.event_generate('<>') - continue - # XXX try: r = self.session.get(self.server + endpoint, timeout=timeout) # type: ignore r.raise_for_status() # Typically 403 "Forbidden" on token expiry From 018b4563b357a1fd6e4f37985e9609434fcf22e9 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 16:12:56 +0100 Subject: [PATCH 018/527] CAPI: return good data from worker & start handling reauth --- EDMarketConnector.py | 7 +++++++ companion.py | 14 ++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index ca30c484..7c13a739 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1075,6 +1075,13 @@ class AppWindow(object): # TODO: Set status text return + except companion.CredentialsError: + # Redirected back to Auth server - force full re-authentication + companion.session.dump(r) + companion.session.invalidate() + companion.session.retrying = False + companion.session.login() + # Companion API problem except companion.ServerLagging as e: err = str(e) diff --git a/companion.py b/companion.py index 7c67a892..4cca98da 100644 --- a/companion.py +++ b/companion.py @@ -642,12 +642,10 @@ class Session(object): if r.url.startswith(SERVER_AUTH): logger.info('Redirected back to Auth Server') - # Redirected back to Auth server - force full re-authentication - self.dump(r) - self.invalidate() - self.retrying = False - self.login() - raise CredentialsError() + self.capi_response_queue.put( + CAPIFailedRequest(f'Redirected back to Auth Server', exception=CredentialsError() + ) + continue elif 500 <= r.status_code < 600: # Server error. Typically 500 "Internal Server Error" if server is down @@ -656,6 +654,10 @@ class Session(object): # LANG: Frontier CAPI data retrieval failed with 5XX code raise ServerError(f'{_("Frontier CAPI server error")}: {r.status_code}') + self.capi_response_queue.put( + data + ) + logger.info('CAPI worker thread DONE') def capi_query_close_worker(self) -> None: From 454c9f3d0c2477a657e249fcb0fadcaea936f89c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 16 Aug 2021 16:27:00 +0100 Subject: [PATCH 019/527] CAPI: Continuing code moving/cleanup up/testing 1. Sending back a spurious CredentialsError() to check it's now handled, but other issues blocking the code from getting there currently. 2. Move the "Update suit data from CAPI" call into the AppWindow handler. 3. Move some more of the old query() exception handling into the worker. 4. session.query() no longer returns anything, and neither should anything that calls it (like session.station()). This is going to take quite some unwinding and code moving. --- EDMarketConnector.py | 5 ++- companion.py | 85 ++++++++++++++++++++------------------------ 2 files changed, 43 insertions(+), 47 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 7c13a739..ec000e78 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -934,7 +934,7 @@ class AppWindow(object): self.w.update_idletasks() querytime = int(time()) - data = companion.session.station() + companion.session.station() config.set('querytime', querytime) @@ -1117,6 +1117,9 @@ class AppWindow(object): if play_sound and play_bad: hotkeymgr.play_bad() + # Update Odyssey Suit data + companion.suit_update(data) + self.update_suit_text() self.suit_show_if_set() self.cooldown() diff --git a/companion.py b/companion.py index 4cca98da..0647f538 100644 --- a/companion.py +++ b/companion.py @@ -621,6 +621,10 @@ class Session(object): try: r = self.session.get(self.server + endpoint, timeout=timeout) # type: ignore r.raise_for_status() # Typically 403 "Forbidden" on token expiry + self.capi_response_queue.put( + CAPIFailedRequest(f'Redirected back to Auth Server', exception=CredentialsError()) + ) + continue data = CAPIData(r.json(), endpoint) # May also fail here if token expired since response is empty except requests.ConnectionError as e: @@ -631,6 +635,28 @@ class Session(object): continue # raise ServerConnectionError(f'Unable to connect to endpoint {endpoint}') from e + except (requests.HTTPError, ValueError) as e: + logger.exception('Frontier CAPI Auth: GET ') + self.dump(r) + self.close() + + if self.retrying: # Refresh just succeeded but this query failed! Force full re-authentication + logger.error('Frontier CAPI Auth: query failed after refresh') + self.invalidate() + self.retrying = False + self.login() + raise CredentialsError('query failed after refresh') from e + + elif self.login(): # Maybe our token expired. Re-authorize in any case + logger.debug('Initial query failed, but login() just worked, trying again...') + self.retrying = True + return self.query(endpoint) + + else: + self.retrying = False + logger.error('Frontier CAPI Auth: HTTP error or invalid JSON') + raise CredentialsError('HTTP error or invalid JSON') from e + except Exception as e: logger.debug('Attempting GET', exc_info=e) # LANG: Frontier CAPI data retrieval failed @@ -643,7 +669,7 @@ class Session(object): if r.url.startswith(SERVER_AUTH): logger.info('Redirected back to Auth Server') self.capi_response_queue.put( - CAPIFailedRequest(f'Redirected back to Auth Server', exception=CredentialsError() + CAPIFailedRequest(f'Redirected back to Auth Server', exception=CredentialsError()) ) continue @@ -654,6 +680,14 @@ class Session(object): # LANG: Frontier CAPI data retrieval failed with 5XX code raise ServerError(f'{_("Frontier CAPI server error")}: {r.status_code}') + self.retrying = False + + if endpoint == URL_QUERY and 'commander' not in data: + logger.error('No commander in returned data') + + if 'timestamp' not in data: + data['timestamp'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date'])) # type: ignore + self.capi_response_queue.put( data ) @@ -664,7 +698,7 @@ class Session(object): """Ask the CAPI query thread to finish.""" self.capi_query_queue.put(None) - def query(self, endpoint: str) -> CAPIData: # noqa: CCR001, C901 + def query(self, endpoint: str) -> None: """Perform a query against the specified CAPI endpoint.""" logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: @@ -680,48 +714,10 @@ class Session(object): raise ServerConnectionError(f'Pretending CAPI down: {endpoint}') self.capi_query_queue.put(endpoint) - try: - ... - except (requests.HTTPError, ValueError) as e: - logger.exception('Frontier CAPI Auth: GET ') - self.dump(r) - self.close() - - if self.retrying: # Refresh just succeeded but this query failed! Force full re-authentication - logger.error('Frontier CAPI Auth: query failed after refresh') - self.invalidate() - self.retrying = False - self.login() - raise CredentialsError('query failed after refresh') from e - - elif self.login(): # Maybe our token expired. Re-authorize in any case - logger.debug('Initial query failed, but login() just worked, trying again...') - self.retrying = True - return self.query(endpoint) - - else: - self.retrying = False - logger.error('Frontier CAPI Auth: HTTP error or invalid JSON') - raise CredentialsError('HTTP error or invalid JSON') from e - - self.retrying = False - if 'timestamp' not in data: - data['timestamp'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date'])) # type: ignore - - # Update Odyssey Suit data - if endpoint == URL_QUERY: - self.suit_update(data) - - return data - - def profile(self) -> CAPIData: + def profile(self): """Perform general CAPI /profile endpoint query.""" - data = self.query(URL_QUERY) - if 'commander' not in data: - logger.error('No commander in returned data') - - return data + self.query(URL_QUERY) def station(self) -> CAPIData: # noqa: CCR001 """ @@ -735,10 +731,7 @@ class Session(object): :return: Possibly augmented CAPI data. """ - data = self.query(URL_QUERY) - if 'commander' not in data: - logger.error('No commander in returned data') - return data + self.query(URL_QUERY) if not data['commander'].get('docked') and not monitor.state['OnFoot']: return data From 23e67dab82d01eef1be292711d6e206cc004389f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:40:49 +0100 Subject: [PATCH 020/527] companion: Move global constants into appropriate classes --- companion.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/companion.py b/companion.py index 0647f538..33c62db6 100644 --- a/companion.py +++ b/companion.py @@ -51,15 +51,6 @@ holdoff = 60 # be nice timeout = 10 # requests timeout auth_timeout = 30 # timeout for initial auth -# Currently the "Elite Dangerous Market Connector (EDCD/Athanasius)" one in -# Athanasius' Frontier account -# Obtain from https://auth.frontierstore.net/client/signup -CLIENT_ID = os.getenv('CLIENT_ID') or 'fb88d428-9110-475f-a3d2-dc151c2b9c7a' -SERVER_AUTH = 'https://auth.frontierstore.net' -URL_AUTH = '/auth' -URL_TOKEN = '/token' -URL_DECODE = '/decode' - USER_AGENT = f'EDCD-{appname}-{appversion()}' SERVER_LIVE = 'https://companion.orerve.net' @@ -239,6 +230,11 @@ class CmdrError(Exception): class Auth(object): """Handles authentication with the Frontier CAPI service via oAuth2.""" + # Currently the "Elite Dangerous Market Connector (EDCD/Athanasius)" one in + # Athanasius' Frontier account + # Obtain from https://auth.frontierstore.net/client/signup + CLIENT_ID = os.getenv('CLIENT_ID') or 'fb88d428-9110-475f-a3d2-dc151c2b9c7a' + def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr self.session = requests.Session() @@ -274,7 +270,7 @@ class Auth(object): logger.debug('We have a refresh token for that idx') data = { 'grant_type': 'refresh_token', - 'client_id': CLIENT_ID, + 'client_id': self.CLIENT_ID, 'refresh_token': tokens[idx], } @@ -313,7 +309,7 @@ class Auth(object): f'{SERVER_AUTH}{URL_AUTH}?response_type=code' f'&audience=frontier,steam,epic' f'&scope=auth capi' - f'&client_id={CLIENT_ID}' + f'&client_id={self.CLIENT_ID}' f'&code_challenge={challenge}' f'&code_challenge_method=S256' f'&state={self.state}' @@ -351,7 +347,7 @@ class Auth(object): logger.debug('Got code, posting it back...') request_data = { 'grant_type': 'authorization_code', - 'client_id': CLIENT_ID, + 'client_id': self.CLIENT_ID, 'code_verifier': self.verifier, 'code': data['code'][0], 'redirect_uri': protocolhandler.redirect, @@ -477,6 +473,10 @@ class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) + SERVER_AUTH = 'https://auth.frontierstore.net' + URL_AUTH = '/auth' + URL_TOKEN = '/token' + URL_DECODE = '/decode' def __init__(self) -> None: self.state = Session.STATE_INIT @@ -521,8 +521,8 @@ class Session(object): :return: True if login succeeded, False if re-authorization initiated. """ - if not CLIENT_ID: - logger.error('CLIENT_ID is None') + if not self.CLIENT_ID: + logger.error('self.CLIENT_ID is None') raise CredentialsError('cannot login without a valid Client ID') # TODO: WTF is the intent behind this logic ? From 692b014cda5a2e549e770fe4adc58c5da059beeb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:41:35 +0100 Subject: [PATCH 021/527] companion: Correct import order of tkinter --- companion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion.py b/companion.py index 33c62db6..00bf8415 100644 --- a/companion.py +++ b/companion.py @@ -15,8 +15,8 @@ import numbers import os import random import threading -import tkinter as tk import time +import tkinter as tk import urllib.parse import webbrowser from builtins import object, range, str From a8231065562a9421189ca66bac478e0dde833451 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:43:38 +0100 Subject: [PATCH 022/527] companion: Rename SERVER_AUTH to FRONTIER_AUTH_SERVER Also moves back to global scope, as it's used in both Auth and Session classes. --- companion.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/companion.py b/companion.py index 00bf8415..070c8cf3 100644 --- a/companion.py +++ b/companion.py @@ -51,6 +51,8 @@ holdoff = 60 # be nice timeout = 10 # requests timeout auth_timeout = 30 # timeout for initial auth +# Used by both class Auth and Session +FRONTIER_AUTH_SERVER = 'https://auth.frontierstore.net' USER_AGENT = f'EDCD-{appname}-{appversion()}' SERVER_LIVE = 'https://companion.orerve.net' @@ -276,7 +278,7 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: - r = self.session.post(SERVER_AUTH + URL_TOKEN, data=data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + URL_TOKEN, data=data, timeout=auth_timeout) if r.status_code == requests.codes.ok: data = r.json() tokens[idx] = data.get('refresh_token', '') @@ -306,7 +308,7 @@ class Auth(object): logger.info(f'Trying auth from scratch for Commander "{self.cmdr}"') challenge = self.base64_url_encode(hashlib.sha256(self.verifier).digest()) webbrowser.open( - f'{SERVER_AUTH}{URL_AUTH}?response_type=code' + f'{FRONTIER_AUTH_SERVER}{URL_AUTH}?response_type=code' f'&audience=frontier,steam,epic' f'&scope=auth capi' f'&client_id={self.CLIENT_ID}' @@ -360,12 +362,12 @@ class Auth(object): # requests_log.setLevel(logging.DEBUG) # requests_log.propagate = True - r = self.session.post(SERVER_AUTH + URL_TOKEN, data=request_data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + URL_TOKEN, data=request_data, timeout=auth_timeout) data_token = r.json() if r.status_code == requests.codes.ok: # Now we need to /decode the token to check the customer_id against FID r = self.session.get( - SERVER_AUTH + URL_DECODE, + FRONTIER_AUTH_SERVER + URL_DECODE, headers={ 'Authorization': f'Bearer {data_token.get("access_token", "")}', 'Content-Type': 'application/json', @@ -473,7 +475,6 @@ class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) - SERVER_AUTH = 'https://auth.frontierstore.net' URL_AUTH = '/auth' URL_TOKEN = '/token' URL_DECODE = '/decode' @@ -666,7 +667,7 @@ class Session(object): ) continue - if r.url.startswith(SERVER_AUTH): + if r.url.startswith(FRONTIER_AUTH_SERVER): logger.info('Redirected back to Auth Server') self.capi_response_queue.put( CAPIFailedRequest(f'Redirected back to Auth Server', exception=CredentialsError()) From f5bde2dcc636fced03904592ae7de82d108ce518 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:45:03 +0100 Subject: [PATCH 023/527] companion: Rename URL_AUTH to FRONTIER_AUTH_PATH, in class Auth --- companion.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index 070c8cf3..455bb07d 100644 --- a/companion.py +++ b/companion.py @@ -237,6 +237,8 @@ class Auth(object): # Obtain from https://auth.frontierstore.net/client/signup CLIENT_ID = os.getenv('CLIENT_ID') or 'fb88d428-9110-475f-a3d2-dc151c2b9c7a' + FRONTIER_AUTH_PATH = '/auth' + def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr self.session = requests.Session() @@ -308,7 +310,7 @@ class Auth(object): logger.info(f'Trying auth from scratch for Commander "{self.cmdr}"') challenge = self.base64_url_encode(hashlib.sha256(self.verifier).digest()) webbrowser.open( - f'{FRONTIER_AUTH_SERVER}{URL_AUTH}?response_type=code' + f'{FRONTIER_AUTH_SERVER}{self.FRONTIER_AUTH_PATH}?response_type=code' f'&audience=frontier,steam,epic' f'&scope=auth capi' f'&client_id={self.CLIENT_ID}' @@ -475,7 +477,6 @@ class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) - URL_AUTH = '/auth' URL_TOKEN = '/token' URL_DECODE = '/decode' From 52a6eeb82a74cc5beb97d162e680f157151dfaa2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:46:47 +0100 Subject: [PATCH 024/527] companion: URL_TOKEN -> Auth.FRONTIER_PATH_TOKEN Also, rename FRONTIER_AUTH_PATH to FRONTIER_PATH_AUTH. --- companion.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/companion.py b/companion.py index 455bb07d..0497ec2c 100644 --- a/companion.py +++ b/companion.py @@ -237,7 +237,8 @@ class Auth(object): # Obtain from https://auth.frontierstore.net/client/signup CLIENT_ID = os.getenv('CLIENT_ID') or 'fb88d428-9110-475f-a3d2-dc151c2b9c7a' - FRONTIER_AUTH_PATH = '/auth' + FRONTIER_PATH_AUTH = '/auth' + FRONTIER_PATH_TOKEN = '/token' def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr @@ -280,7 +281,7 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: - r = self.session.post(FRONTIER_AUTH_SERVER + URL_TOKEN, data=data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_TOKEN, data=data, timeout=auth_timeout) if r.status_code == requests.codes.ok: data = r.json() tokens[idx] = data.get('refresh_token', '') @@ -310,7 +311,7 @@ class Auth(object): logger.info(f'Trying auth from scratch for Commander "{self.cmdr}"') challenge = self.base64_url_encode(hashlib.sha256(self.verifier).digest()) webbrowser.open( - f'{FRONTIER_AUTH_SERVER}{self.FRONTIER_AUTH_PATH}?response_type=code' + f'{FRONTIER_AUTH_SERVER}{self.FRONTIER_PATH_AUTH}?response_type=code' f'&audience=frontier,steam,epic' f'&scope=auth capi' f'&client_id={self.CLIENT_ID}' @@ -364,7 +365,7 @@ class Auth(object): # requests_log.setLevel(logging.DEBUG) # requests_log.propagate = True - r = self.session.post(FRONTIER_AUTH_SERVER + URL_TOKEN, data=request_data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_TOKEN, data=request_data, timeout=auth_timeout) data_token = r.json() if r.status_code == requests.codes.ok: # Now we need to /decode the token to check the customer_id against FID @@ -477,7 +478,6 @@ class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) - URL_TOKEN = '/token' URL_DECODE = '/decode' def __init__(self) -> None: From 661ffb100b746f7a73ddbcae7f72fa562e900a60 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:48:09 +0100 Subject: [PATCH 025/527] companion: URL_DECODE -> Auth.FRONTIER_PATH_DECODE --- companion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index 0497ec2c..b0b7a870 100644 --- a/companion.py +++ b/companion.py @@ -239,6 +239,7 @@ class Auth(object): FRONTIER_PATH_AUTH = '/auth' FRONTIER_PATH_TOKEN = '/token' + FRONTIER_PATH_DECODE = '/decode' def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr @@ -370,7 +371,7 @@ class Auth(object): if r.status_code == requests.codes.ok: # Now we need to /decode the token to check the customer_id against FID r = self.session.get( - FRONTIER_AUTH_SERVER + URL_DECODE, + FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_DECODE, headers={ 'Authorization': f'Bearer {data_token.get("access_token", "")}', 'Content-Type': 'application/json', @@ -478,7 +479,6 @@ class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) - URL_DECODE = '/decode' def __init__(self) -> None: self.state = Session.STATE_INIT From 6f9f71d69965475fab113a9c5a474cb01637071e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:49:15 +0100 Subject: [PATCH 026/527] companion: s/FRONTIER_PATH/FRONTIER_AUTH_PATH/g This is so as to keep Frontier *auth* separate from Frontier *CAPI*. --- companion.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/companion.py b/companion.py index b0b7a870..afaa198b 100644 --- a/companion.py +++ b/companion.py @@ -237,9 +237,9 @@ class Auth(object): # Obtain from https://auth.frontierstore.net/client/signup CLIENT_ID = os.getenv('CLIENT_ID') or 'fb88d428-9110-475f-a3d2-dc151c2b9c7a' - FRONTIER_PATH_AUTH = '/auth' - FRONTIER_PATH_TOKEN = '/token' - FRONTIER_PATH_DECODE = '/decode' + FRONTIER_AUTH_PATH_AUTH = '/auth' + FRONTIER_AUTH_PATH_TOKEN = '/token' + FRONTIER_AUTH_PATH_DECODE = '/decode' def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr @@ -282,7 +282,7 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: - r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_TOKEN, data=data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=data, timeout=auth_timeout) if r.status_code == requests.codes.ok: data = r.json() tokens[idx] = data.get('refresh_token', '') @@ -312,7 +312,7 @@ class Auth(object): logger.info(f'Trying auth from scratch for Commander "{self.cmdr}"') challenge = self.base64_url_encode(hashlib.sha256(self.verifier).digest()) webbrowser.open( - f'{FRONTIER_AUTH_SERVER}{self.FRONTIER_PATH_AUTH}?response_type=code' + f'{FRONTIER_AUTH_SERVER}{self.FRONTIER_AUTH_PATH_AUTH}?response_type=code' f'&audience=frontier,steam,epic' f'&scope=auth capi' f'&client_id={self.CLIENT_ID}' @@ -366,12 +366,12 @@ class Auth(object): # requests_log.setLevel(logging.DEBUG) # requests_log.propagate = True - r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_TOKEN, data=request_data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=request_data, timeout=auth_timeout) data_token = r.json() if r.status_code == requests.codes.ok: # Now we need to /decode the token to check the customer_id against FID r = self.session.get( - FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_DECODE, + FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_DECODE, headers={ 'Authorization': f'Bearer {data_token.get("access_token", "")}', 'Content-Type': 'application/json', From 58ea0abd5e2e862b17bdbabe2a982780cd5f4efb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:52:04 +0100 Subject: [PATCH 027/527] companion: s/URL_MARKET/Session.FRONTIER_CAPI_PATH_MARKET/g --- companion.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/companion.py b/companion.py index afaa198b..9822b501 100644 --- a/companion.py +++ b/companion.py @@ -57,8 +57,6 @@ USER_AGENT = f'EDCD-{appname}-{appversion()}' SERVER_LIVE = 'https://companion.orerve.net' SERVER_BETA = 'https://pts-companion.orerve.net' -URL_QUERY = '/profile' -URL_MARKET = '/market' URL_SHIPYARD = '/shipyard' commodity_map: Dict = {} @@ -480,6 +478,9 @@ class Session(object): STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) + FRONTIER_CAPI_PATH_PROFILE = '/profile' + FRONTIER_CAPI_PATH_MARKET = '/market' + def __init__(self) -> None: self.state = Session.STATE_INIT self.server: Optional[str] = None @@ -684,7 +685,7 @@ class Session(object): self.retrying = False - if endpoint == URL_QUERY and 'commander' not in data: + if endpoint == self.FRONTIER_CAPI_PATH_PROFILE and 'commander' not in data: logger.error('No commander in returned data') if 'timestamp' not in data: @@ -719,7 +720,7 @@ class Session(object): def profile(self): """Perform general CAPI /profile endpoint query.""" - self.query(URL_QUERY) + self.query(self.FRONTIER_CAPI_PATH_PROFILE) def station(self) -> CAPIData: # noqa: CCR001 """ @@ -733,7 +734,7 @@ class Session(object): :return: Possibly augmented CAPI data. """ - self.query(URL_QUERY) + self.query(self.FRONTIER_CAPI_PATH_PROFILE) if not data['commander'].get('docked') and not monitor.state['OnFoot']: return data @@ -771,7 +772,7 @@ class Session(object): last_starport_id = int(last_starport.get('id')) if services.get('commodities'): - marketdata = self.query(URL_MARKET) + marketdata = self.query(self.FRONTIER_CAPI_PATH_MARKET) if last_starport_id != int(marketdata['id']): logger.warning(f"{last_starport_id!r} != {int(marketdata['id'])!r}") raise ServerLagging() From 305ba157ec8502652d61fa4b45e13a3ccfcd71e4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:54:03 +0100 Subject: [PATCH 028/527] companion: s/URL_SHIPYARD/Session.FRONTIER_CAPI_PATH_SHIPYARD/g --- companion.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/companion.py b/companion.py index 9822b501..e016c03e 100644 --- a/companion.py +++ b/companion.py @@ -57,7 +57,6 @@ USER_AGENT = f'EDCD-{appname}-{appversion()}' SERVER_LIVE = 'https://companion.orerve.net' SERVER_BETA = 'https://pts-companion.orerve.net' -URL_SHIPYARD = '/shipyard' commodity_map: Dict = {} @@ -80,7 +79,7 @@ class CAPIData(UserDict): if source_endpoint is None: return - if source_endpoint == URL_SHIPYARD and self.data.get('lastStarport'): + if source_endpoint == self.FRONTIER_CAPI_PATH_SHIPYARD and self.data.get('lastStarport'): # All the other endpoints may or may not have a lastStarport, but definitely wont have valid data # for this check, which means it'll just make noise for no reason while we're working on other things self.check_modules_ships() @@ -480,6 +479,7 @@ class Session(object): FRONTIER_CAPI_PATH_PROFILE = '/profile' FRONTIER_CAPI_PATH_MARKET = '/market' + FRONTIER_CAPI_PATH_SHIPYARD = '/shipyard' def __init__(self) -> None: self.state = Session.STATE_INIT @@ -782,7 +782,7 @@ class Session(object): data['lastStarport'].update(marketdata) if services.get('outfitting') or services.get('shipyard'): - shipdata = self.query(URL_SHIPYARD) + shipdata = self.query(self.FRONTIER_CAPI_PATH_SHIPYARD) if last_starport_id != int(shipdata['id']): logger.warning(f"{last_starport_id!r} != {int(shipdata['id'])!r}") raise ServerLagging() From 3fe097a9551ff4abb28f15605ea34e5ed5c13e60 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 14:57:21 +0100 Subject: [PATCH 029/527] companion: Start moving CAPI 'station' query into thread worker --- companion.py | 123 +++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 59 deletions(-) diff --git a/companion.py b/companion.py index e016c03e..afd212c7 100644 --- a/companion.py +++ b/companion.py @@ -480,6 +480,9 @@ class Session(object): FRONTIER_CAPI_PATH_PROFILE = '/profile' FRONTIER_CAPI_PATH_MARKET = '/market' FRONTIER_CAPI_PATH_SHIPYARD = '/shipyard' + # This is a dummy value, to signal to Session.capi_query_worker that we + # the 'station' triplet of queries. + _CAPI_PATH_STATION = '_edmc_station' def __init__(self) -> None: self.state = Session.STATE_INIT @@ -621,6 +624,65 @@ class Session(object): break logger.trace_if('capi.worker', f'Processing query: {endpoint}') + self.query(self.FRONTIER_CAPI_PATH_PROFILE) + + if not data['commander'].get('docked') and not monitor.state['OnFoot']: + return data + + # Sanity checks in case data isn't as we expect, and maybe 'docked' flag + # is also lagging. + if (last_starport := data.get('lastStarport')) is None: + logger.error("No lastStarport in data!") + return data + + if ((last_starport_name := last_starport.get('name')) is None + or last_starport_name == ''): + # This could well be valid if you've been out exploring for a long + # time. + logger.warning("No lastStarport name!") + return data + + # WORKAROUND: n/a | 06-08-2021: Issue 1198 and https://issues.frontierstore.net/issue-detail/40706 + # -- strip "+" chars off star port names returned by the CAPI + last_starport_name = last_starport["name"] = last_starport_name.rstrip(" +") + + services = last_starport.get('services', {}) + if not isinstance(services, dict): + # Odyssey Alpha Phase 3 4.0.0.20 has been observed having + # this be an empty list when you've jumped to another system + # and not yet docked. As opposed to no services key at all + # or an empty dict. + logger.error(f'services is "{type(services)}", not dict !') + if __debug__: + self.dump_capi_data(data) + + # Set an empty dict so as to not have to retest below. + services = {} + + last_starport_id = int(last_starport.get('id')) + + if services.get('commodities'): + marketdata = self.query(self.FRONTIER_CAPI_PATH_MARKET) + if last_starport_id != int(marketdata['id']): + logger.warning(f"{last_starport_id!r} != {int(marketdata['id'])!r}") + raise ServerLagging() + + else: + marketdata['name'] = last_starport_name + data['lastStarport'].update(marketdata) + + if services.get('outfitting') or services.get('shipyard'): + shipdata = self.query(self.FRONTIER_CAPI_PATH_SHIPYARD) + if last_starport_id != int(shipdata['id']): + logger.warning(f"{last_starport_id!r} != {int(shipdata['id'])!r}") + raise ServerLagging() + + else: + shipdata['name'] = last_starport_name + data['lastStarport'].update(shipdata) + # WORKAROUND END + + return data try: r = self.session.get(self.server + endpoint, timeout=timeout) # type: ignore r.raise_for_status() # Typically 403 "Forbidden" on token expiry @@ -734,65 +796,8 @@ class Session(object): :return: Possibly augmented CAPI data. """ - self.query(self.FRONTIER_CAPI_PATH_PROFILE) - - if not data['commander'].get('docked') and not monitor.state['OnFoot']: - return data - - # Sanity checks in case data isn't as we expect, and maybe 'docked' flag - # is also lagging. - if (last_starport := data.get('lastStarport')) is None: - logger.error("No lastStarport in data!") - return data - - if ((last_starport_name := last_starport.get('name')) is None - or last_starport_name == ''): - # This could well be valid if you've been out exploring for a long - # time. - logger.warning("No lastStarport name!") - return data - - # WORKAROUND: n/a | 06-08-2021: Issue 1198 and https://issues.frontierstore.net/issue-detail/40706 - # -- strip "+" chars off star port names returned by the CAPI - last_starport_name = last_starport["name"] = last_starport_name.rstrip(" +") - - services = last_starport.get('services', {}) - if not isinstance(services, dict): - # Odyssey Alpha Phase 3 4.0.0.20 has been observed having - # this be an empty list when you've jumped to another system - # and not yet docked. As opposed to no services key at all - # or an empty dict. - logger.error(f'services is "{type(services)}", not dict !') - if __debug__: - self.dump_capi_data(data) - - # Set an empty dict so as to not have to retest below. - services = {} - - last_starport_id = int(last_starport.get('id')) - - if services.get('commodities'): - marketdata = self.query(self.FRONTIER_CAPI_PATH_MARKET) - if last_starport_id != int(marketdata['id']): - logger.warning(f"{last_starport_id!r} != {int(marketdata['id'])!r}") - raise ServerLagging() - - else: - marketdata['name'] = last_starport_name - data['lastStarport'].update(marketdata) - - if services.get('outfitting') or services.get('shipyard'): - shipdata = self.query(self.FRONTIER_CAPI_PATH_SHIPYARD) - if last_starport_id != int(shipdata['id']): - logger.warning(f"{last_starport_id!r} != {int(shipdata['id'])!r}") - raise ServerLagging() - - else: - shipdata['name'] = last_starport_name - data['lastStarport'].update(shipdata) -# WORKAROUND END - - return data + # Ask the thread worker to perform all three queries + self.capi_query_queue.put(_CAPI_PATH_STATION) ###################################################################### ###################################################################### From c1deb9113ecc68e2274c56cfb7123442b334e03a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 16:12:58 +0100 Subject: [PATCH 030/527] CAPI: 'station' query going via work queue * Defined inner functions in the worker function to handle the actual queries. This allows for *them* to simply return data or raise exceptions to be caught by the main worker function. *IT* then handles returning any error appropriately via the queue to AppWindow. * Due to the coupling between AppWindow and these queries there are several extra parameters passed into the queue worker and then back out. This is largely due to having to split AppWindow.getandsend() into two functions: capi_request_data() and capi_handle_response(). This might get changed to use a class to encapsulate those values, rather than the bare tuple currently being used. * No full flake8 & mypy pass done yet. * Some companion.py globals renamed so their use is more obvious. --- EDMarketConnector.py | 40 +++--- companion.py | 285 +++++++++++++++++++++++++++---------------- 2 files changed, 203 insertions(+), 122 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index ec000e78..fcf56211 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -18,7 +18,7 @@ from os.path import dirname, join from queue import Queue from sys import platform from time import localtime, strftime, time -from typing import TYPE_CHECKING, Optional, Tuple +from typing import TYPE_CHECKING, Optional, Tuple, Union # Have this as early as possible for people running EDMarketConnector.exe # from cmd.exe or a bat file or similar. Else they might not be in the correct @@ -385,7 +385,7 @@ class AppWindow(object): def __init__(self, master: tk.Tk): # noqa: C901, CCR001 # TODO - can possibly factor something out - self.holdofftime = config.get_int('querytime', default=0) + companion.holdoff + self.capi_query_holdoff_time = config.get_int('querytime', default=0) + companion.capi_query_cooldown self.capi_response_queue: Queue = Queue() companion.session.set_capi_response_queue(self.capi_response_queue) @@ -894,7 +894,7 @@ class AppWindow(object): return True - def capi_request_data(self, event=None, retrying: bool = False): # noqa: C901, CCR001 + def capi_request_data(self, event=None, retrying: bool = False): """ Perform CAPI data retrieval and associated actions. @@ -903,23 +903,23 @@ class AppWindow(object): """ auto_update = not event play_sound = (auto_update or int(event.type) == self.EVENT_VIRTUAL) and not config.get_int('hotkey_mute') - play_bad = False - err: Optional[str] = None if ( not monitor.cmdr or not monitor.mode or monitor.state['Captain'] or not monitor.system or monitor.mode == 'CQC' ): + logger.trace_if('capi.worker', 'CQC detected, aborting query') return # In CQC or on crew - do nothing if companion.session.state == companion.Session.STATE_AUTH: + logger.trace_if('capi.worker', 'Auth in progress? Aborting query') # Attempt another Auth self.login() return if not retrying: - if time() < self.holdofftime: # Was invoked by key while in cooldown - if play_sound and (self.holdofftime - time()) < companion.holdoff * 0.75: + if time() < self.capi_query_holdoff_time: # Was invoked by key while in cooldown + if play_sound and (self.capi_query_holdoff_time - time()) < companion.capi_query_cooldown * 0.75: self.status['text'] = '' hotkeymgr.play_bad() # Don't play sound in first few seconds to prevent repeats @@ -934,14 +934,23 @@ class AppWindow(object): self.w.update_idletasks() querytime = int(time()) - companion.session.station() + logger.trace_if('capi.worker', 'Requesting full station data') + companion.session.station(querytime=querytime, play_sound=play_sound) config.set('querytime', querytime) def capi_handle_response(self, event=None): """Handle the resulting data from a CAPI query.""" + play_bad = False + err: Optional[str] = None + + data: Union[companion.CAPIData, companion.CAPIFailedRequest] + querytime: int + play_sound: bool + auto_update: bool try: - data = self.capi_response_queue.get(block=False) + logger.trace_if('capi.worker', 'Pulling answer off queue') + data, querytime, play_sound, auto_update = self.capi_response_queue.get(block=False) if isinstance(data, companion.CAPIFailedRequest): logger.trace_if('capi.worker', f'Failed Request: {data.message}') if data.exception: @@ -950,6 +959,7 @@ class AppWindow(object): else: raise ValueError(data.message) + logger.trace_if('capi.worker', 'Answer is not a Failure') # Validation if 'commander' not in data: # This can happen with EGS Auth if no commander created yet @@ -972,6 +982,7 @@ class AppWindow(object): elif monitor.cmdr and data['commander']['name'] != monitor.cmdr: # Companion API Commander doesn't match Journal + logger.trace_if('capi.worker', 'Raising CmdrError()') raise companion.CmdrError() elif auto_update and not monitor.state['OnFoot'] and not data['commander'].get('docked'): @@ -1010,7 +1021,7 @@ class AppWindow(object): f"{last_station!r} != {monitor.station!r}") raise companion.ServerLagging() - self.holdofftime = querytime + companion.holdoff + self.capi_query_holdoff_time = querytime + companion.capi_query_cooldown elif not monitor.state['OnFoot'] and data['ship']['id'] != monitor.state['ShipID']: # CAPI ship must match @@ -1025,6 +1036,7 @@ class AppWindow(object): raise companion.ServerLagging() else: + # TODO: Change to depend on its own CL arg if __debug__: # Recording companion.session.dump_capi_data(data) @@ -1068,7 +1080,7 @@ class AppWindow(object): err = 'Error: Exporting Market data' play_bad = True - self.holdofftime = querytime + companion.holdoff + self.capi_query_holdoff_time = querytime + companion.capi_query_cooldown except queue.Empty: logger.error('There was no response in the queue!') @@ -1118,7 +1130,7 @@ class AppWindow(object): hotkeymgr.play_bad() # Update Odyssey Suit data - companion.suit_update(data) + companion.session.suit_update(data) self.update_suit_text() self.suit_show_if_set() @@ -1398,10 +1410,10 @@ class AppWindow(object): def cooldown(self) -> None: """Display and update the cooldown timer for 'Update' button.""" - if time() < self.holdofftime: + if time() < self.capi_query_holdoff_time: # Update button in main window self.button['text'] = self.theme_button['text'] \ - = _('cooldown {SS}s').format(SS=int(self.holdofftime - time())) # LANG: Cooldown on 'Update' button + = _('cooldown {SS}s').format(SS=int(self.capi_query_holdoff_time - time())) # LANG: Cooldown on 'Update' button self.w.after(1000, self.cooldown) else: diff --git a/companion.py b/companion.py index afd212c7..27cb8207 100644 --- a/companion.py +++ b/companion.py @@ -47,8 +47,8 @@ else: # Define custom type for the dicts that hold CAPI data # CAPIData = NewType('CAPIData', Dict) -holdoff = 60 # be nice -timeout = 10 # requests timeout +capi_query_cooldown = 60 # be nice +capi_default_timeout = 10 # requests timeout auth_timeout = 30 # timeout for initial auth # Used by both class Auth and Session @@ -79,7 +79,7 @@ class CAPIData(UserDict): if source_endpoint is None: return - if source_endpoint == self.FRONTIER_CAPI_PATH_SHIPYARD and self.data.get('lastStarport'): + if source_endpoint == Session.FRONTIER_CAPI_PATH_SHIPYARD and self.data.get('lastStarport'): # All the other endpoints may or may not have a lastStarport, but definitely wont have valid data # for this check, which means it'll just make noise for no reason while we're working on other things self.check_modules_ships() @@ -527,7 +527,7 @@ class Session(object): :return: True if login succeeded, False if re-authorization initiated. """ - if not self.CLIENT_ID: + if not Auth.CLIENT_ID: logger.error('self.CLIENT_ID is None') raise CredentialsError('cannot login without a valid Client ID') @@ -617,88 +617,23 @@ class Session(object): """Worker thread that performs actual CAPI queries.""" logger.info('CAPI worker thread starting') - while True: - endpoint: Optional[str] = self.capi_query_queue.get() - if not endpoint: - logger.info('Empty queue message, exiting...') - break + def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: + """ + Perform a *single* CAPI endpoint query within the thread worker. - logger.trace_if('capi.worker', f'Processing query: {endpoint}') - self.query(self.FRONTIER_CAPI_PATH_PROFILE) - - if not data['commander'].get('docked') and not monitor.state['OnFoot']: - return data - - # Sanity checks in case data isn't as we expect, and maybe 'docked' flag - # is also lagging. - if (last_starport := data.get('lastStarport')) is None: - logger.error("No lastStarport in data!") - return data - - if ((last_starport_name := last_starport.get('name')) is None - or last_starport_name == ''): - # This could well be valid if you've been out exploring for a long - # time. - logger.warning("No lastStarport name!") - return data - - # WORKAROUND: n/a | 06-08-2021: Issue 1198 and https://issues.frontierstore.net/issue-detail/40706 - # -- strip "+" chars off star port names returned by the CAPI - last_starport_name = last_starport["name"] = last_starport_name.rstrip(" +") - - services = last_starport.get('services', {}) - if not isinstance(services, dict): - # Odyssey Alpha Phase 3 4.0.0.20 has been observed having - # this be an empty list when you've jumped to another system - # and not yet docked. As opposed to no services key at all - # or an empty dict. - logger.error(f'services is "{type(services)}", not dict !') - if __debug__: - self.dump_capi_data(data) - - # Set an empty dict so as to not have to retest below. - services = {} - - last_starport_id = int(last_starport.get('id')) - - if services.get('commodities'): - marketdata = self.query(self.FRONTIER_CAPI_PATH_MARKET) - if last_starport_id != int(marketdata['id']): - logger.warning(f"{last_starport_id!r} != {int(marketdata['id'])!r}") - raise ServerLagging() - - else: - marketdata['name'] = last_starport_name - data['lastStarport'].update(marketdata) - - if services.get('outfitting') or services.get('shipyard'): - shipdata = self.query(self.FRONTIER_CAPI_PATH_SHIPYARD) - if last_starport_id != int(shipdata['id']): - logger.warning(f"{last_starport_id!r} != {int(shipdata['id'])!r}") - raise ServerLagging() - - else: - shipdata['name'] = last_starport_name - data['lastStarport'].update(shipdata) - # WORKAROUND END - - return data + :param capi_endpoint: An actual Frontier CAPI endpoint to query. + :param timeout: requests query timeout to use. + :return: The resulting CAPI data, of type CAPIData. + """ + capi_data: CAPIData try: - r = self.session.get(self.server + endpoint, timeout=timeout) # type: ignore + r = self.session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore r.raise_for_status() # Typically 403 "Forbidden" on token expiry - self.capi_response_queue.put( - CAPIFailedRequest(f'Redirected back to Auth Server', exception=CredentialsError()) - ) - continue - data = CAPIData(r.json(), endpoint) # May also fail here if token expired since response is empty + capi_data = CAPIData(r.json(), capi_endpoint) # May also fail here if token expired since response is empty except requests.ConnectionError as e: - logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {endpoint})') - self.capi_response_queue.put( - CAPIFailedRequest(f'Unable to connect to endpoint {endpoint}', exception=e) - ) - continue - # raise ServerConnectionError(f'Unable to connect to endpoint {endpoint}') from e + logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {capi_endpoint})') + raise ServerConnectionError(f'Unable to connect to endpoint: {capi_endpoint}') from e except (requests.HTTPError, ValueError) as e: logger.exception('Frontier CAPI Auth: GET ') @@ -712,10 +647,12 @@ class Session(object): self.login() raise CredentialsError('query failed after refresh') from e + # TODO: Better to return error and have upstream re-try auth ? elif self.login(): # Maybe our token expired. Re-authorize in any case logger.debug('Initial query failed, but login() just worked, trying again...') self.retrying = True - return self.query(endpoint) + # TODO: This, or raise (custom?) exception for upstream to do it? + return capi_single_query(capi_endpoint) else: self.retrying = False @@ -725,18 +662,11 @@ class Session(object): except Exception as e: logger.debug('Attempting GET', exc_info=e) # LANG: Frontier CAPI data retrieval failed - # raise ServerError(f'{_("Frontier CAPI query failure")}: {endpoint}') from e - self.capi_response_queue.put( - CAPIFailedRequest(f'Frontier CAPI query failure: {endpoint}', exception=e) - ) - continue + raise ServerError(f'{_("Frontier CAPI query failure")}: {capi_endpoint}') from e if r.url.startswith(FRONTIER_AUTH_SERVER): logger.info('Redirected back to Auth Server') - self.capi_response_queue.put( - CAPIFailedRequest(f'Redirected back to Auth Server', exception=CredentialsError()) - ) - continue + raise CredentialsError('Redirected back to Auth Server') elif 500 <= r.status_code < 600: # Server error. Typically 500 "Internal Server Error" if server is down @@ -747,15 +677,145 @@ class Session(object): self.retrying = False - if endpoint == self.FRONTIER_CAPI_PATH_PROFILE and 'commander' not in data: + if capi_endpoint == self.FRONTIER_CAPI_PATH_PROFILE and 'commander' not in capi_data: logger.error('No commander in returned data') - if 'timestamp' not in data: - data['timestamp'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date'])) # type: ignore + if 'timestamp' not in capi_data: + capi_data['timestamp'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date'])) # type: ignore - self.capi_response_queue.put( - data - ) + return capi_data + + def capi_station_queries(timeout: int = capi_default_timeout) -> CAPIData: + """ + Perform all 'station' queries for the caller. + + A /profile query is performed to check that we are docked (or on foot) + and the station name and marketid match the prior Docked event. + If they do match, and the services list says they're present, also + retrieve CAPI market and/or shipyard/outfitting data and merge into + the /profile data. + + :param timeout: requests timeout to use. + :return: CAPIData instance with what we retrieved. + """ + station_data = capi_single_query(self.FRONTIER_CAPI_PATH_PROFILE, timeout=timeout) + + if not station_data['commander'].get('docked') and not monitor.state['OnFoot']: + return station_data + + # Sanity checks in case data isn't as we expect, and maybe 'docked' flag + # is also lagging. + if (last_starport := station_data.get('lastStarport')) is None: + logger.error("No lastStarport in data!") + return station_data + + if ((last_starport_name := last_starport.get('name')) is None + or last_starport_name == ''): + # This could well be valid if you've been out exploring for a long + # time. + logger.warning("No lastStarport name!") + return station_data + + # WORKAROUND: n/a | 06-08-2021: Issue 1198 and https://issues.frontierstore.net/issue-detail/40706 + # -- strip "+" chars off star port names returned by the CAPI + last_starport_name = last_starport["name"] = last_starport_name.rstrip(" +") + + services = last_starport.get('services', {}) + if not isinstance(services, dict): + # Odyssey Alpha Phase 3 4.0.0.20 has been observed having + # this be an empty list when you've jumped to another system + # and not yet docked. As opposed to no services key at all + # or an empty dict. + logger.error(f'services is "{type(services)}", not dict !') + # TODO: Change this to be dependent on its own CL arg + if __debug__: + self.dump_capi_data(station_data) + + # Set an empty dict so as to not have to retest below. + services = {} + + last_starport_id = int(last_starport.get('id')) + + if services.get('commodities'): + market_data = capi_single_query(self.FRONTIER_CAPI_PATH_MARKET, timeout=timeout) + if last_starport_id != int(market_data['id']): + logger.warning(f"{last_starport_id!r} != {int(market_data['id'])!r}") + raise ServerLagging() + + else: + market_data['name'] = last_starport_name + station_data['lastStarport'].update(market_data) + + if services.get('outfitting') or services.get('shipyard'): + shipyard_data = capi_single_query(self.FRONTIER_CAPI_PATH_SHIPYARD, timeout=timeout) + if last_starport_id != int(shipyard_data['id']): + logger.warning(f"{last_starport_id!r} != {int(shipyard_data['id'])!r}") + raise ServerLagging() + + else: + shipyard_data['name'] = last_starport_name + station_data['lastStarport'].update(shipyard_data) + # WORKAROUND END + + return station_data + + while True: + endpoint: Optional[str] + querytime: int + play_sound: bool + auto_update: bool + endpoint, querytime, play_sound, auto_update = self.capi_query_queue.get() + if not endpoint: + logger.info('Empty queue message, exiting...') + break + + logger.trace_if('capi.worker', f'Processing query: {endpoint}') + data: CAPIData + if endpoint == self._CAPI_PATH_STATION: + try: + data = capi_station_queries() + + except Exception as e: + self.capi_response_queue.put( + ( + CAPIFailedRequest( + message=e.args, + exception=e + ), + querytime, + play_sound, + auto_update + ) + ) + + else: + self.capi_response_queue.put( + (data, querytime, play_sound, auto_update) + ) + + else: + try: + data = capi_single_query(self.FRONTIER_CAPI_PATH_PROFILE) + + except Exception as e: + self.capi_response_queue.put( + ( + CAPIFailedRequest( + message=e.args, + exception=e + ), + querytime, + play_sound, + auto_update + ) + ) + + else: + self.capi_response_queue.put( + (data, querytime, play_sound, auto_update) + ) + + self.tk_master.event_generate('<>') logger.info('CAPI worker thread DONE') @@ -763,8 +823,16 @@ class Session(object): """Ask the CAPI query thread to finish.""" self.capi_query_queue.put(None) - def query(self, endpoint: str) -> None: - """Perform a query against the specified CAPI endpoint.""" + def query(self, endpoint: str, querytime: int, play_sound: bool = False, auto_update: bool = False) -> None: + """ + Perform a query against the specified CAPI endpoint. + + :param querytime: When this query was initiated. + :param play_sound: Whether the app should play a sound on error. + :param endpoint: The CAPI endpoint to query, might be a pseudo-value. + :param auto_update: Whether this request was triggered automatically. + :return: + """ logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: if self.login(): @@ -778,26 +846,27 @@ class Session(object): if conf_module.capi_pretend_down: raise ServerConnectionError(f'Pretending CAPI down: {endpoint}') - self.capi_query_queue.put(endpoint) + self.capi_query_queue.put( + (endpoint, querytime, play_sound, auto_update) + ) def profile(self): """Perform general CAPI /profile endpoint query.""" self.query(self.FRONTIER_CAPI_PATH_PROFILE) - def station(self) -> CAPIData: # noqa: CCR001 + def station(self, querytime: int, play_sound: bool = False, auto_update: bool = False) -> CAPIData: """ Perform CAPI quer(y|ies) for station data. - A /profile query is performed to check that we are docked (or on foot) - and the station name and marketid match the prior Docked event. - If they do match, and the services list says they're present, also - retrieve CAPI market and/or shipyard/outfitting data and merge into - the /profile data. - + :param querytime: When this query was initiated. + :param play_sound: Whether the app should play a sound on error. + :param auto_update: Whether this request was triggered automatically. :return: Possibly augmented CAPI data. """ # Ask the thread worker to perform all three queries - self.capi_query_queue.put(_CAPI_PATH_STATION) + self.capi_query_queue.put( + (self._CAPI_PATH_STATION, querytime, play_sound, auto_update) + ) ###################################################################### ###################################################################### From 62b1f0dd0d5c231e96af7100b7e0c5375d9b6de6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 16:34:54 +0100 Subject: [PATCH 031/527] companion: flake8 pass --- companion.py | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/companion.py b/companion.py index 27cb8207..c65460a2 100644 --- a/companion.py +++ b/companion.py @@ -279,7 +279,11 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: - r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=data, timeout=auth_timeout) + r = self.session.post( + FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, + data=data, + timeout=auth_timeout + ) if r.status_code == requests.codes.ok: data = r.json() tokens[idx] = data.get('refresh_token', '') @@ -363,7 +367,11 @@ class Auth(object): # requests_log.setLevel(logging.DEBUG) # requests_log.propagate = True - r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=request_data, timeout=auth_timeout) + r = self.session.post( + FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, + data=request_data, + timeout=auth_timeout + ) data_token = r.json() if r.status_code == requests.codes.ok: # Now we need to /decode the token to check the customer_id against FID @@ -472,6 +480,7 @@ class CAPIFailedRequest(): self.message = message self.exception = exception + class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" @@ -505,9 +514,11 @@ class Session(object): logger.info('Done') def set_capi_response_queue(self, capi_response_queue: Queue) -> None: + """Set a reference to the CAPI response data queue.""" self.capi_response_queue = capi_response_queue def set_tk_master(self, master: tk.Tk) -> None: + """Set a reference to main UI Tk root window.""" self.tk_master = master ###################################################################### @@ -613,7 +624,7 @@ class Session(object): ###################################################################### # CAPI queries ###################################################################### - def capi_query_worker(self): + def capi_query_worker(self): # noqa: C901, CCR001 """Worker thread that performs actual CAPI queries.""" logger.info('CAPI worker thread starting') @@ -629,7 +640,8 @@ class Session(object): try: r = self.session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore r.raise_for_status() # Typically 403 "Forbidden" on token expiry - capi_data = CAPIData(r.json(), capi_endpoint) # May also fail here if token expired since response is empty + # May also fail here if token expired since response is empty + capi_data = CAPIData(r.json(), capi_endpoint) except requests.ConnectionError as e: logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {capi_endpoint})') @@ -681,11 +693,13 @@ class Session(object): logger.error('No commander in returned data') if 'timestamp' not in capi_data: - capi_data['timestamp'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date'])) # type: ignore + capi_data['timestamp'] = time.strftime( + '%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date']) + ) # type: ignore return capi_data - def capi_station_queries(timeout: int = capi_default_timeout) -> CAPIData: + def capi_station_queries(timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 """ Perform all 'station' queries for the caller. From e5d200311e24db57da7f5b0b390b7aa4fbfabc7e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 16:41:39 +0100 Subject: [PATCH 032/527] companion: mypy pass * Still need to change stats.py to use a cached copy of CAPI data, rather than it querying that itself. That means actually storing that cached copy whilst in the capi worker. --- companion.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/companion.py b/companion.py index c65460a2..fe500abe 100644 --- a/companion.py +++ b/companion.py @@ -694,8 +694,8 @@ class Session(object): if 'timestamp' not in capi_data: capi_data['timestamp'] = time.strftime( - '%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date']) - ) # type: ignore + '%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date']) # type: ignore + ) return capi_data @@ -850,7 +850,8 @@ class Session(object): logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: if self.login(): - return self.query(endpoint) + self.query(endpoint, querytime, play_sound=play_sound, auto_update=auto_update) + return elif self.state == Session.STATE_AUTH: logger.error('cannot make a query when unauthorized') @@ -864,18 +865,23 @@ class Session(object): (endpoint, querytime, play_sound, auto_update) ) - def profile(self): - """Perform general CAPI /profile endpoint query.""" - self.query(self.FRONTIER_CAPI_PATH_PROFILE) + def profile(self, querytime: int = int(time.time()), play_sound: bool = False, auto_update: bool = False) -> None: + """ + Perform general CAPI /profile endpoint query. - def station(self, querytime: int, play_sound: bool = False, auto_update: bool = False) -> CAPIData: + :param querytime: When this query was initiated. + :param play_sound: Whether the app should play a sound on error. + :param auto_update: Whether this request was triggered automatically. + """ + self.query(self.FRONTIER_CAPI_PATH_PROFILE, querytime=querytime, play_sound=play_sound, auto_update=auto_update) + + def station(self, querytime: int, play_sound: bool = False, auto_update: bool = False) -> None: """ Perform CAPI quer(y|ies) for station data. :param querytime: When this query was initiated. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. - :return: Possibly augmented CAPI data. """ # Ask the thread worker to perform all three queries self.capi_query_queue.put( From 3f817c0fc0b4ccdb0dd05c5654bfb19f6edc7f58 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 16:45:07 +0100 Subject: [PATCH 033/527] companion: TODO: store /profile data for use elsewhere --- companion.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/companion.py b/companion.py index fe500abe..a9d57753 100644 --- a/companion.py +++ b/companion.py @@ -697,6 +697,8 @@ class Session(object): '%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date']) # type: ignore ) + # TODO: Store a copy of this if it was /profile, e.g. for use by + # stats.py return capi_data def capi_station_queries(timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 From 8d7072fda45dc7d1f590cdb68d1a4aedc1d6922e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 17 Aug 2021 16:45:41 +0100 Subject: [PATCH 034/527] stats.py: TODO: Use cached /profile CAPI data when available --- stats.py | 1 + 1 file changed, 1 insertion(+) diff --git a/stats.py b/stats.py index b64a3261..6a9c19bf 100644 --- a/stats.py +++ b/stats.py @@ -275,6 +275,7 @@ class StatsDialog(): if not monitor.cmdr: return + # TODO: This needs to use cached data # LANG: Fetching data from Frontier CAPI in order to display on File > Status self.status['text'] = _('Fetching data...') self.parent.update_idletasks() From 92e3ce9f4b492a54cba2e165e0e70a1975a9d834 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 19 Aug 2021 12:47:24 +0100 Subject: [PATCH 035/527] CAPI: Notes/dummy classes for using them to encapsulate requests/responses --- companion.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/companion.py b/companion.py index a9d57753..954830bf 100644 --- a/companion.py +++ b/companion.py @@ -473,6 +473,16 @@ class Auth(object): return base64.urlsafe_b64encode(text).decode().replace('=', '') +class CAPIRequest(): + """Encapsulates a request for CAPI data.""" + ... + + +class CAPIResponse(): + """Encapsulates a response from CAPI quer(y|ies).""" + ... + + class CAPIFailedRequest(): """CAPI failed query error class.""" @@ -656,6 +666,8 @@ class Session(object): logger.error('Frontier CAPI Auth: query failed after refresh') self.invalidate() self.retrying = False + # TODO: This must NOT happen here, we need to signal back to the requesting + # code that it needs to sort out auth. self.login() raise CredentialsError('query failed after refresh') from e From dc705b92e5c3899ab1504db3343704be70e9136d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 23 Aug 2021 15:29:49 +0100 Subject: [PATCH 036/527] companion: Convert to EDMCCAPIRequest class, not bare tuple --- companion.py | 56 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/companion.py b/companion.py index 954830bf..a1c9b401 100644 --- a/companion.py +++ b/companion.py @@ -473,13 +473,24 @@ class Auth(object): return base64.urlsafe_b64encode(text).decode().replace('=', '') -class CAPIRequest(): +class EDMCCAPIRequest(): """Encapsulates a request for CAPI data.""" - ... + + endpoint: str # The CAPI query to perform. + querytime: int # When this query is considered to have started (time_t). + play_sound: bool # Whether to play good/bad sounds for success/failure. + auto_update: bool # Whether this was automatically triggered. + + def __init__(self, endpoint: str, querytime: int, play_sound: bool = False, auto_update: bool = False): + self.endpoint = endpoint + self.querytime = querytime + self.play_sound = play_sound + self.auto_update = auto_update -class CAPIResponse(): +class EDMCCAPIResponse(): """Encapsulates a response from CAPI quer(y|ies).""" + ... @@ -792,14 +803,15 @@ class Session(object): querytime: int play_sound: bool auto_update: bool - endpoint, querytime, play_sound, auto_update = self.capi_query_queue.get() - if not endpoint: + # endpoint, querytime, play_sound, auto_update = self.capi_query_queue.get() + query = self.capi_query_queue.get() + if not query.endpoint: logger.info('Empty queue message, exiting...') break - logger.trace_if('capi.worker', f'Processing query: {endpoint}') + logger.trace_if('capi.worker', f'Processing query: {query.endpoint}') data: CAPIData - if endpoint == self._CAPI_PATH_STATION: + if query.endpoint == self._CAPI_PATH_STATION: try: data = capi_station_queries() @@ -810,15 +822,15 @@ class Session(object): message=e.args, exception=e ), - querytime, - play_sound, - auto_update + query.querytime, + query.play_sound, + query.auto_update ) ) else: self.capi_response_queue.put( - (data, querytime, play_sound, auto_update) + (data, query.querytime, query.play_sound, query.auto_update) ) else: @@ -832,15 +844,15 @@ class Session(object): message=e.args, exception=e ), - querytime, - play_sound, - auto_update + query.querytime, + query.play_sound, + query.auto_update ) ) else: self.capi_response_queue.put( - (data, querytime, play_sound, auto_update) + (data, query.querytime, query.play_sound, query.auto_update) ) self.tk_master.event_generate('<>') @@ -876,7 +888,12 @@ class Session(object): raise ServerConnectionError(f'Pretending CAPI down: {endpoint}') self.capi_query_queue.put( - (endpoint, querytime, play_sound, auto_update) + EDMCCAPIRequest( + endpoint=endpoint, + querytime=querytime, + play_sound=play_sound, + auto_update=auto_update + ) ) def profile(self, querytime: int = int(time.time()), play_sound: bool = False, auto_update: bool = False) -> None: @@ -899,7 +916,12 @@ class Session(object): """ # Ask the thread worker to perform all three queries self.capi_query_queue.put( - (self._CAPI_PATH_STATION, querytime, play_sound, auto_update) + EDMCCAPIRequest( + endpoint=self._CAPI_PATH_STATION, + querytime=querytime, + play_sound=play_sound, + auto_update=auto_update + ) ) ###################################################################### From c6f93bd3c609bd4cb87e2966549b74c628a952a0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 23 Aug 2021 15:36:21 +0100 Subject: [PATCH 037/527] companion: Update "close down" check for using EDMCAPIRequest --- companion.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/companion.py b/companion.py index a1c9b401..a689e957 100644 --- a/companion.py +++ b/companion.py @@ -803,11 +803,15 @@ class Session(object): querytime: int play_sound: bool auto_update: bool - # endpoint, querytime, play_sound, auto_update = self.capi_query_queue.get() query = self.capi_query_queue.get() - if not query.endpoint: - logger.info('Empty queue message, exiting...') - break + if not isinstance(query, EDMCCAPIRequest): + if query is not None: + logger.error("Item from queue wasn't an EDMCCAPIRequest") + break + + else: + logger.info('Empty queue message, exiting...') + break logger.trace_if('capi.worker', f'Processing query: {query.endpoint}') data: CAPIData From f80623e025796a5950589dcd28504e99f93add2d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 23 Aug 2021 16:28:26 +0100 Subject: [PATCH 038/527] CAPI: Convert full Update flow to class passing * Base the following on common EDMCCAPIReturn: EDMCFailedrequest, EDMCCAPIRequest, EDMCCAPIResponse. This saves repeating a bunch of variable types and comments. * Use the above throughout the 'Update' button flow. * Still need to address 'Save Raw Data', i.e. AppWindow.save_raw(). --- EDMarketConnector.py | 133 ++++++++++++++++++++++++------------------- companion.py | 118 ++++++++++++++++++++++++++------------ 2 files changed, 157 insertions(+), 94 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index fcf56211..170a9a86 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -935,77 +935,86 @@ class AppWindow(object): querytime = int(time()) logger.trace_if('capi.worker', 'Requesting full station data') - companion.session.station(querytime=querytime, play_sound=play_sound) + companion.session.station( + querytime=querytime, retrying=retrying, play_sound=play_sound + ) config.set('querytime', querytime) - - def capi_handle_response(self, event=None): + def capi_handle_response(self, event=None): # noqa: C901, CCR001 """Handle the resulting data from a CAPI query.""" - play_bad = False + play_bad: bool = False err: Optional[str] = None - data: Union[companion.CAPIData, companion.CAPIFailedRequest] - querytime: int - play_sound: bool - auto_update: bool + capi_response: Union[companion.CAPIFailedRequest, companion.EDMCCAPIResponse] try: logger.trace_if('capi.worker', 'Pulling answer off queue') - data, querytime, play_sound, auto_update = self.capi_response_queue.get(block=False) - if isinstance(data, companion.CAPIFailedRequest): - logger.trace_if('capi.worker', f'Failed Request: {data.message}') - if data.exception: - raise data.exception + capi_response = self.capi_response_queue.get(block=False) + if isinstance(capi_response, companion.CAPIFailedRequest): + logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') + if capi_response.exception: + raise capi_response.exception else: - raise ValueError(data.message) + raise ValueError(capi_response.message) logger.trace_if('capi.worker', 'Answer is not a Failure') + if not isinstance(capi_response, companion.EDMCCAPIResponse): + msg = f"Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}" + logger.error(msg) + raise ValueError(msg) + # Validation - if 'commander' not in data: + if 'commander' not in capi_response.capi_data: # This can happen with EGS Auth if no commander created yet # LANG: No data was returned for the commander from the Frontier CAPI err = self.status['text'] = _('CAPI: No commander data returned') - elif not data.get('commander', {}).get('name'): + elif not capi_response.capi_data.get('commander', {}).get('name'): # LANG: We didn't have the commander name when we should have err = self.status['text'] = _("Who are you?!") # Shouldn't happen - elif (not data.get('lastSystem', {}).get('name') - or (data['commander'].get('docked') - and not data.get('lastStarport', {}).get('name'))): + elif (not capi_response.capi_data.get('lastSystem', {}).get('name') + or (capi_response.capi_data['commander'].get('docked') + and not capi_response.capi_data.get('lastStarport', {}).get('name'))): # LANG: We don't know where the commander is, when we should err = self.status['text'] = _("Where are you?!") # Shouldn't happen - elif not data.get('ship', {}).get('name') or not data.get('ship', {}).get('modules'): + elif ( + not capi_response.capi_data.get('ship', {}).get('name') + or not capi_response.capi_data.get('ship', {}).get('modules') + ): # LANG: We don't know what ship the commander is in, when we should err = self.status['text'] = _("What are you flying?!") # Shouldn't happen - elif monitor.cmdr and data['commander']['name'] != monitor.cmdr: + elif monitor.cmdr and capi_response.capi_data['commander']['name'] != monitor.cmdr: # Companion API Commander doesn't match Journal logger.trace_if('capi.worker', 'Raising CmdrError()') raise companion.CmdrError() - elif auto_update and not monitor.state['OnFoot'] and not data['commander'].get('docked'): + elif ( + capi_response.auto_update and not monitor.state['OnFoot'] + and not capi_response.capi_data['commander'].get('docked') + ): # auto update is only when just docked - logger.warning(f"{auto_update!r} and not {monitor.state['OnFoot']!r} and " - f"not {data['commander'].get('docked')!r}") + logger.warning(f"{capi_response.auto_update!r} and not {monitor.state['OnFoot']!r} and " + f"not {capi_response.capi_data['commander'].get('docked')!r}") raise companion.ServerLagging() - elif data['lastSystem']['name'] != monitor.system: + elif capi_response.capi_data['lastSystem']['name'] != monitor.system: # CAPI system must match last journal one - logger.warning(f"{data['lastSystem']['name']!r} != {monitor.system!r}") + logger.warning(f"{capi_response.capi_data['lastSystem']['name']!r} != {monitor.system!r}") raise companion.ServerLagging() - elif data['lastStarport']['name'] != monitor.station: + elif capi_response.capi_data['lastStarport']['name'] != monitor.station: if monitor.state['OnFoot'] and monitor.station: - logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " + logger.warning(f"({capi_response.capi_data['lastStarport']['name']!r} != {monitor.station!r}) AND " f"{monitor.state['OnFoot']!r} and {monitor.station!r}") raise companion.ServerLagging() else: last_station = None - if data['commander']['docked']: - last_station = data['lastStarport']['name'] + if capi_response.capi_data['commander']['docked']: + last_station = capi_response.capi_data['lastStarport']['name'] if monitor.station is None: # Likely (re-)Embarked on ship docked at an EDO settlement. @@ -1017,33 +1026,40 @@ class AppWindow(object): if last_station != monitor.station: # CAPI lastStarport must match - logger.warning(f"({data['lastStarport']['name']!r} != {monitor.station!r}) AND " - f"{last_station!r} != {monitor.station!r}") + logger.warning(f"({capi_response.capi_data['lastStarport']['name']!r} != {monitor.station!r})" + f" AND {last_station!r} != {monitor.station!r}") raise companion.ServerLagging() - self.capi_query_holdoff_time = querytime + companion.capi_query_cooldown + self.capi_query_holdoff_time = capi_response.querytime + companion.capi_query_cooldown - elif not monitor.state['OnFoot'] and data['ship']['id'] != monitor.state['ShipID']: + elif not monitor.state['OnFoot'] and capi_response.capi_data['ship']['id'] != monitor.state['ShipID']: # CAPI ship must match logger.warning(f"not {monitor.state['OnFoot']!r} and " - f"{data['ship']['id']!r} != {monitor.state['ShipID']!r}") + f"{capi_response.capi_data['ship']['id']!r} != {monitor.state['ShipID']!r}") raise companion.ServerLagging() - elif not monitor.state['OnFoot'] and data['ship']['name'].lower() != monitor.state['ShipType']: + elif ( + not monitor.state['OnFoot'] + and capi_response.capi_data['ship']['name'].lower() != monitor.state['ShipType'] + ): # CAPI ship type must match logger.warning(f"not {monitor.state['OnFoot']!r} and " - f"{data['ship']['name'].lower()!r} != {monitor.state['ShipType']!r}") + f"{capi_response.capi_data['ship']['name'].lower()!r} != " + f"{monitor.state['ShipType']!r}") raise companion.ServerLagging() else: # TODO: Change to depend on its own CL arg if __debug__: # Recording - companion.session.dump_capi_data(data) + companion.session.dump_capi_data(capi_response.capi_data) if not monitor.state['ShipType']: # Started game in SRV or fighter - self.ship['text'] = ship_name_map.get(data['ship']['name'].lower(), data['ship']['name']) - monitor.state['ShipID'] = data['ship']['id'] - monitor.state['ShipType'] = data['ship']['name'].lower() + self.ship['text'] = ship_name_map.get( + capi_response.capi_data['ship']['name'].lower(), + capi_response.capi_data['ship']['name'] + ) + monitor.state['ShipID'] = capi_response.capi_data['ship']['id'] + monitor.state['ShipType'] = capi_response.capi_data['ship']['name'].lower() if not monitor.state['Modules']: self.ship.configure(state=tk.DISABLED) @@ -1053,43 +1069,42 @@ class AppWindow(object): self.ship.configure(state=True) if monitor.state.get('SuitCurrent') is not None: - if (loadout := data.get('loadout')) is not None: + if (loadout := capi_response.capi_data.get('loadout')) is not None: if (suit := loadout.get('suit')) is not None: if (suitname := suit.get('edmcName')) is not None: # We've been paranoid about loadout->suit->suitname, now just assume loadouts is there loadout_name = index_possibly_sparse_list( - data['loadouts'], loadout['loadoutSlotId'] + capi_response.capi_data['loadouts'], loadout['loadoutSlotId'] )['name'] self.suit['text'] = f'{suitname} ({loadout_name})' self.suit_show_if_set() - if data['commander'].get('credits') is not None: - monitor.state['Credits'] = data['commander']['credits'] - monitor.state['Loan'] = data['commander'].get('debt', 0) + if capi_response.capi_data['commander'].get('credits') is not None: + monitor.state['Credits'] = capi_response.capi_data['commander']['credits'] + monitor.state['Loan'] = capi_response.capi_data['commander'].get('debt', 0) # stuff we can do when not docked - err = plug.notify_newdata(data, monitor.is_beta) + err = plug.notify_newdata(capi_response.capi_data, monitor.is_beta) self.status['text'] = err and err or '' if err: play_bad = True # Export market data - if not self.export_market_data(data): + if not self.export_market_data(capi_response.capi_data): err = 'Error: Exporting Market data' play_bad = True - self.capi_query_holdoff_time = querytime + companion.capi_query_cooldown + self.capi_query_holdoff_time = capi_response.querytime + companion.capi_query_cooldown except queue.Empty: - logger.error('There was no response in the queue!') - # TODO: Set status text - return + logger.error('There was no response in the queue!') + # TODO: Set status text + return except companion.CredentialsError: # Redirected back to Auth server - force full re-authentication - companion.session.dump(r) companion.session.invalidate() companion.session.retrying = False companion.session.login() @@ -1097,7 +1112,7 @@ class AppWindow(object): # Companion API problem except companion.ServerLagging as e: err = str(e) - if retrying: + if capi_response.retrying: self.status['text'] = err play_bad = True @@ -1124,13 +1139,13 @@ class AppWindow(object): if not err: # not self.status['text']: # no errors # LANG: Time when we last obtained Frontier CAPI data - self.status['text'] = strftime(_('Last updated at %H:%M:%S'), localtime(querytime)) + self.status['text'] = strftime(_('Last updated at %H:%M:%S'), localtime(capi_response.querytime)) - if play_sound and play_bad: + if capi_response.play_sound and play_bad: hotkeymgr.play_bad() # Update Odyssey Suit data - companion.session.suit_update(data) + companion.session.suit_update(capi_response.capi_data) self.update_suit_text() self.suit_show_if_set() @@ -1413,7 +1428,9 @@ class AppWindow(object): if time() < self.capi_query_holdoff_time: # Update button in main window self.button['text'] = self.theme_button['text'] \ - = _('cooldown {SS}s').format(SS=int(self.capi_query_holdoff_time - time())) # LANG: Cooldown on 'Update' button + = _('cooldown {SS}s').format( # LANG: Cooldown on 'Update' button + SS=int(self.capi_query_holdoff_time - time()) + ) self.w.after(1000, self.cooldown) else: diff --git a/companion.py b/companion.py index a689e957..04f5bd74 100644 --- a/companion.py +++ b/companion.py @@ -473,33 +473,52 @@ class Auth(object): return base64.urlsafe_b64encode(text).decode().replace('=', '') -class EDMCCAPIRequest(): +class EDMCCAPIReturn: + """Base class for Request, Failure or Response.""" + + def __init__( + self, querytime: int, retrying: bool = False, + play_sound: bool = False, auto_update: bool = False + ): + self.querytime: int = querytime # When this query is considered to have started (time_t). + self.retrying: bool = retrying # Whether this is already a retry. + self.play_sound: bool = play_sound # Whether to play good/bad sounds for success/failure. + self.auto_update: bool = auto_update # Whether this was automatically triggered. + + +class EDMCCAPIRequest(EDMCCAPIReturn): """Encapsulates a request for CAPI data.""" - endpoint: str # The CAPI query to perform. - querytime: int # When this query is considered to have started (time_t). - play_sound: bool # Whether to play good/bad sounds for success/failure. - auto_update: bool # Whether this was automatically triggered. - - def __init__(self, endpoint: str, querytime: int, play_sound: bool = False, auto_update: bool = False): - self.endpoint = endpoint - self.querytime = querytime - self.play_sound = play_sound - self.auto_update = auto_update + def __init__( + self, endpoint: str, + querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + ): + super().__init__(querytime=querytime, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + self.endpoint: str = endpoint # The CAPI query to perform. -class EDMCCAPIResponse(): +class EDMCCAPIResponse(EDMCCAPIReturn): """Encapsulates a response from CAPI quer(y|ies).""" - ... + def __init__( + self, capi_data: CAPIData, + querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + ): + super().__init__(querytime=querytime, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + self.capi_data: CAPIData = capi_data # Frontier CAPI response, possibly augmented (station query) -class CAPIFailedRequest(): +class CAPIFailedRequest(EDMCCAPIReturn): """CAPI failed query error class.""" - def __init__(self, message, exception=None): - self.message = message - self.exception = exception + def __init__( + self, message: str, + querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False, + exception=None + ): + super().__init__(querytime=querytime, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + self.message: str = message # User-friendly reason for failure. + self.exception: int = exception # Exception that recipient should raise. class Session(object): @@ -701,6 +720,7 @@ class Session(object): if r.url.startswith(FRONTIER_AUTH_SERVER): logger.info('Redirected back to Auth Server') + self.dump(r) raise CredentialsError('Redirected back to Auth Server') elif 500 <= r.status_code < 600: @@ -814,49 +834,59 @@ class Session(object): break logger.trace_if('capi.worker', f'Processing query: {query.endpoint}') - data: CAPIData + capi_data: CAPIData if query.endpoint == self._CAPI_PATH_STATION: try: - data = capi_station_queries() + capi_data = capi_station_queries() except Exception as e: self.capi_response_queue.put( ( CAPIFailedRequest( message=e.args, - exception=e + exception=e, + querytime=query.querytime, + play_sound=query.play_sound, + auto_update=query.auto_update ), - query.querytime, - query.play_sound, - query.auto_update ) ) else: self.capi_response_queue.put( - (data, query.querytime, query.play_sound, query.auto_update) + EDMCCAPIResponse( + capi_data=capi_data, + querytime=query.querytime, + play_sound=query.play_sound, + auto_update=query.auto_update + ) ) else: try: - data = capi_single_query(self.FRONTIER_CAPI_PATH_PROFILE) + capi_data = capi_single_query(self.FRONTIER_CAPI_PATH_PROFILE) except Exception as e: self.capi_response_queue.put( ( CAPIFailedRequest( message=e.args, - exception=e + exception=e, + querytime=query.querytime, + play_sound=query.play_sound, + auto_update=query.auto_update ), - query.querytime, - query.play_sound, - query.auto_update ) ) else: self.capi_response_queue.put( - (data, query.querytime, query.play_sound, query.auto_update) + EDMCCAPIResponse( + capi_data=capi_data, + querytime=query.querytime, + play_sound=query.play_sound, + auto_update=query.auto_update + ) ) self.tk_master.event_generate('<>') @@ -867,15 +897,17 @@ class Session(object): """Ask the CAPI query thread to finish.""" self.capi_query_queue.put(None) - def query(self, endpoint: str, querytime: int, play_sound: bool = False, auto_update: bool = False) -> None: + def query( + self, endpoint: str, + querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + ) -> None: """ Perform a query against the specified CAPI endpoint. :param querytime: When this query was initiated. + :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. - :param endpoint: The CAPI endpoint to query, might be a pseudo-value. :param auto_update: Whether this request was triggered automatically. - :return: """ logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: @@ -894,27 +926,40 @@ class Session(object): self.capi_query_queue.put( EDMCCAPIRequest( endpoint=endpoint, + retrying=retrying, querytime=querytime, play_sound=play_sound, auto_update=auto_update ) ) - def profile(self, querytime: int = int(time.time()), play_sound: bool = False, auto_update: bool = False) -> None: + def profile( + self, + querytime: int = int(time.time()), retrying: bool = False, + play_sound: bool = False, auto_update: bool = False + ) -> None: """ Perform general CAPI /profile endpoint query. :param querytime: When this query was initiated. + :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ - self.query(self.FRONTIER_CAPI_PATH_PROFILE, querytime=querytime, play_sound=play_sound, auto_update=auto_update) + self.query( + self.FRONTIER_CAPI_PATH_PROFILE, querytime=querytime, retrying=retrying, + play_sound=play_sound, auto_update=auto_update + ) - def station(self, querytime: int, play_sound: bool = False, auto_update: bool = False) -> None: + def station( + self, + querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + ) -> None: """ Perform CAPI quer(y|ies) for station data. :param querytime: When this query was initiated. + :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ @@ -923,6 +968,7 @@ class Session(object): EDMCCAPIRequest( endpoint=self._CAPI_PATH_STATION, querytime=querytime, + retrying=retrying, play_sound=play_sound, auto_update=auto_update ) From d53b567fca64cdd9d1cc64a3ad2e054ffc826177 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 23 Aug 2021 16:43:35 +0100 Subject: [PATCH 039/527] CAPI: s/querytime/query_time/ in variable names But not in the config setting, as that would require a migration. --- EDMarketConnector.py | 12 +++++------ companion.py | 48 ++++++++++++++++++++------------------------ 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 170a9a86..fc1b0432 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -933,12 +933,12 @@ class AppWindow(object): self.button['state'] = self.theme_button['state'] = tk.DISABLED self.w.update_idletasks() - querytime = int(time()) + query_time = int(time()) logger.trace_if('capi.worker', 'Requesting full station data') companion.session.station( - querytime=querytime, retrying=retrying, play_sound=play_sound + query_time=query_time, retrying=retrying, play_sound=play_sound ) - config.set('querytime', querytime) + config.set('querytime', query_time) def capi_handle_response(self, event=None): # noqa: C901, CCR001 """Handle the resulting data from a CAPI query.""" @@ -1030,7 +1030,7 @@ class AppWindow(object): f" AND {last_station!r} != {monitor.station!r}") raise companion.ServerLagging() - self.capi_query_holdoff_time = capi_response.querytime + companion.capi_query_cooldown + self.capi_query_holdoff_time = capi_response.query_time + companion.capi_query_cooldown elif not monitor.state['OnFoot'] and capi_response.capi_data['ship']['id'] != monitor.state['ShipID']: # CAPI ship must match @@ -1096,7 +1096,7 @@ class AppWindow(object): err = 'Error: Exporting Market data' play_bad = True - self.capi_query_holdoff_time = capi_response.querytime + companion.capi_query_cooldown + self.capi_query_holdoff_time = capi_response.query_time + companion.capi_query_cooldown except queue.Empty: logger.error('There was no response in the queue!') @@ -1139,7 +1139,7 @@ class AppWindow(object): if not err: # not self.status['text']: # no errors # LANG: Time when we last obtained Frontier CAPI data - self.status['text'] = strftime(_('Last updated at %H:%M:%S'), localtime(capi_response.querytime)) + self.status['text'] = strftime(_('Last updated at %H:%M:%S'), localtime(capi_response.query_time)) if capi_response.play_sound and play_bad: hotkeymgr.play_bad() diff --git a/companion.py b/companion.py index 04f5bd74..9f40cc5e 100644 --- a/companion.py +++ b/companion.py @@ -477,10 +477,10 @@ class EDMCCAPIReturn: """Base class for Request, Failure or Response.""" def __init__( - self, querytime: int, retrying: bool = False, + self, query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False ): - self.querytime: int = querytime # When this query is considered to have started (time_t). + self.query_time: int = query_time # When this query is considered to have started (time_t). self.retrying: bool = retrying # Whether this is already a retry. self.play_sound: bool = play_sound # Whether to play good/bad sounds for success/failure. self.auto_update: bool = auto_update # Whether this was automatically triggered. @@ -491,9 +491,9 @@ class EDMCCAPIRequest(EDMCCAPIReturn): def __init__( self, endpoint: str, - querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False ): - super().__init__(querytime=querytime, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + super().__init__(query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update) self.endpoint: str = endpoint # The CAPI query to perform. @@ -502,9 +502,9 @@ class EDMCCAPIResponse(EDMCCAPIReturn): def __init__( self, capi_data: CAPIData, - querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False ): - super().__init__(querytime=querytime, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + super().__init__(query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update) self.capi_data: CAPIData = capi_data # Frontier CAPI response, possibly augmented (station query) @@ -513,10 +513,10 @@ class CAPIFailedRequest(EDMCCAPIReturn): def __init__( self, message: str, - querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False, + query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False, exception=None ): - super().__init__(querytime=querytime, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + super().__init__(query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update) self.message: str = message # User-friendly reason for failure. self.exception: int = exception # Exception that recipient should raise. @@ -819,10 +819,6 @@ class Session(object): return station_data while True: - endpoint: Optional[str] - querytime: int - play_sound: bool - auto_update: bool query = self.capi_query_queue.get() if not isinstance(query, EDMCCAPIRequest): if query is not None: @@ -845,7 +841,7 @@ class Session(object): CAPIFailedRequest( message=e.args, exception=e, - querytime=query.querytime, + query_time=query.query_time, play_sound=query.play_sound, auto_update=query.auto_update ), @@ -856,7 +852,7 @@ class Session(object): self.capi_response_queue.put( EDMCCAPIResponse( capi_data=capi_data, - querytime=query.querytime, + query_time=query.query_time, play_sound=query.play_sound, auto_update=query.auto_update ) @@ -872,7 +868,7 @@ class Session(object): CAPIFailedRequest( message=e.args, exception=e, - querytime=query.querytime, + query_time=query.query_time, play_sound=query.play_sound, auto_update=query.auto_update ), @@ -883,7 +879,7 @@ class Session(object): self.capi_response_queue.put( EDMCCAPIResponse( capi_data=capi_data, - querytime=query.querytime, + query_time=query.query_time, play_sound=query.play_sound, auto_update=query.auto_update ) @@ -899,12 +895,12 @@ class Session(object): def query( self, endpoint: str, - querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False ) -> None: """ Perform a query against the specified CAPI endpoint. - :param querytime: When this query was initiated. + :param query_time: When this query was initiated. :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. @@ -912,7 +908,7 @@ class Session(object): logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: if self.login(): - self.query(endpoint, querytime, play_sound=play_sound, auto_update=auto_update) + self.query(endpoint, query_time, play_sound=play_sound, auto_update=auto_update) return elif self.state == Session.STATE_AUTH: @@ -927,7 +923,7 @@ class Session(object): EDMCCAPIRequest( endpoint=endpoint, retrying=retrying, - querytime=querytime, + query_time=query_time, play_sound=play_sound, auto_update=auto_update ) @@ -935,30 +931,30 @@ class Session(object): def profile( self, - querytime: int = int(time.time()), retrying: bool = False, + query_time: int = int(time.time()), retrying: bool = False, play_sound: bool = False, auto_update: bool = False ) -> None: """ Perform general CAPI /profile endpoint query. - :param querytime: When this query was initiated. + :param query_time: When this query was initiated. :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ self.query( - self.FRONTIER_CAPI_PATH_PROFILE, querytime=querytime, retrying=retrying, + self.FRONTIER_CAPI_PATH_PROFILE, query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update ) def station( self, - querytime: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False ) -> None: """ Perform CAPI quer(y|ies) for station data. - :param querytime: When this query was initiated. + :param query_time: When this query was initiated. :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. @@ -967,7 +963,7 @@ class Session(object): self.capi_query_queue.put( EDMCCAPIRequest( endpoint=self._CAPI_PATH_STATION, - querytime=querytime, + query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update From c71fe042cd96a777f955c47b5f815174ffafb530 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 23 Aug 2021 17:25:49 +0100 Subject: [PATCH 040/527] companion: Saw *raw* copies of CAPI data * Using global dict on class CAPIDataRaw as there should only ever be one of these. *Any* querying of CAPI should record the response data in this single place. * But as there'll be multiple endpoints recorded, class CAPIDataRawEndpoint uses instance variables. * It is the raw string from `requests.Response.content.decode(encoding='utf-8')` that is recorded, not the result of JSON decoding. * The recording happens in the worker capi_single_query() so it's as close as possible to where the data came back. The query_time is allowed to take on the default utc_now() value, rather than matching the nominal query_time of the request as passed in. --- companion.py | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/companion.py b/companion.py index 9f40cc5e..c3a7000f 100644 --- a/companion.py +++ b/companion.py @@ -9,6 +9,7 @@ protocol used for the callback. import base64 import collections import csv +import datetime import hashlib import json import numbers @@ -64,7 +65,10 @@ commodity_map: Dict = {} class CAPIData(UserDict): """CAPI Response.""" - def __init__(self, data: Union[str, Dict[str, Any], 'CAPIData', None] = None, source_endpoint: str = None) -> None: + def __init__( + self, + data: Union[str, Dict[str, Any], 'CAPIData', None] = None, source_endpoint: str = None + ) -> None: if data is None: super().__init__() elif isinstance(data, str): @@ -121,6 +125,38 @@ class CAPIData(UserDict): self.data['lastStarport']['ships'] = {'shipyard_list': {}, 'unavailable_list': []} +class CAPIDataRawEndpoint: + """Last received CAPI response for a specific endpoint.""" + + def __init__(self, raw_data: str, query_time: datetime.datetime): + self.query_time = query_time + self.raw_data = raw_data + # TODO: Maybe requests.response status ? + + +class CAPIDataRaw: + """The last obtained raw CAPI response for each end point.""" + + raw_data: Dict[str, CAPIDataRawEndpoint] = {} + + def record_endpoint( + self, endpoint: str, + raw_data: str, + query_time: datetime.datetime = datetime.datetime.utcnow() + ): + """Record the latest raw data for the given endpoint.""" + self.raw_data[endpoint] = CAPIDataRawEndpoint(raw_data, query_time) + + def __str__(self): + """Return a more readable string form of the data.""" + capi_data_str = '' + for e in self.raw_data.keys(): + capi_data_str += f'"{e}":\n{{\n\t"query_time": {self.raw_data[e].query_time},\n\t' \ + f'"raw_data": {self.raw_data[e].raw_data}\n}}\n\n' + + return capi_data_str + + def listify(thing: Union[List, Dict]) -> List: """ Convert actual JSON array or int-indexed dict into a Python list. @@ -542,6 +578,7 @@ class Session(object): self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query self.tk_master: Optional[tk.Tk] = None + self.capi_raw_data = CAPIDataRaw() logger.info('Starting CAPI queries thread...') self.capi_response_queue: Queue self.capi_query_queue: Queue = Queue() @@ -668,7 +705,7 @@ class Session(object): """Worker thread that performs actual CAPI queries.""" logger.info('CAPI worker thread starting') - def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: + def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 """ Perform a *single* CAPI endpoint query within the thread worker. @@ -681,7 +718,9 @@ class Session(object): r = self.session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore r.raise_for_status() # Typically 403 "Forbidden" on token expiry # May also fail here if token expired since response is empty - capi_data = CAPIData(r.json(), capi_endpoint) + capi_json = r.json() + capi_data = CAPIData(capi_json, capi_endpoint) + self.capi_raw_data.record_endpoint(capi_endpoint, r.content.decode(encoding='utf-8')) except requests.ConnectionError as e: logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {capi_endpoint})') From 1c93c3a9fa40d103b421d0f021bd19143de82711 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 23 Aug 2021 18:01:04 +0100 Subject: [PATCH 041/527] CAPI: 'Save Raw Data' now using cached copy It will write a file containing JSON that has a top level dict with a key per endpoint we have data for, and within each of those a dict with keys for query_time and the raw_data. Everything from the opening `{` in that raw_data value until the matching closing `}` is the raw data from the CAPI service. The whole file happily goes through `jq -S -C '.'` to examine the output. --- EDMarketConnector.py | 60 ++++++++++++++++---------------------------- companion.py | 9 ++++--- 2 files changed, 27 insertions(+), 42 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index fc1b0432..901eb763 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -4,7 +4,6 @@ import argparse import html -import json import locale import pathlib import queue @@ -1558,47 +1557,30 @@ class AppWindow(object): self.destroy() self.__class__.showing = False - def save_raw(self) -> None: # noqa: CCR001 # Not easily broken up. - """Save newly acquired CAPI data in the configured file.""" - # LANG: Status - Attempting to retrieve data from Frontier CAPI to save to file - self.status['text'] = _('Fetching data...') - self.w.update_idletasks() + def save_raw(self) -> None: + """ + Save any CAPI data already acquired to a file. - try: - data: CAPIData = companion.session.station() - self.status['text'] = '' - default_extension: str = '' + This specifically does *not* cause new queries to be performed, as the + purpose is to aid in diagnosing any issues that occurred during 'normal' + queries. + """ + default_extension: str = '' - if platform == 'darwin': - default_extension = '.json' + if platform == 'darwin': + default_extension = '.json' - last_system: str = data.get("lastSystem", {}).get("name", "Unknown") - last_starport: str = '' - - if data['commander'].get('docked'): - last_starport = '.' + data.get('lastStarport', {}).get('name', 'Unknown') - - timestamp: str = strftime('%Y-%m-%dT%H.%M.%S', localtime()) - f = tkinter.filedialog.asksaveasfilename( - parent=self.w, - defaultextension=default_extension, - filetypes=[('JSON', '.json'), ('All Files', '*')], - initialdir=config.get_str('outdir'), - initialfile=f'{last_system}{last_starport}.{timestamp}' - ) - if f: - with open(f, 'wb') as h: - h.write(json.dumps(dict(data), - ensure_ascii=False, - indent=2, - sort_keys=True, - separators=(',', ': ')).encode('utf-8')) - except companion.ServerError as e: - self.status['text'] = str(e) - - except Exception as e: - logger.debug('"other" exception', exc_info=e) - self.status['text'] = str(e) + timestamp: str = strftime('%Y-%m-%dT%H.%M.%S', localtime()) + f = tkinter.filedialog.asksaveasfilename( + parent=self.w, + defaultextension=default_extension, + filetypes=[('JSON', '.json'), ('All Files', '*')], + initialdir=config.get_str('outdir'), + initialfile=f'{monitor.system}{monitor.station}.{timestamp}' + ) + if f: + with open(f, 'wb') as h: + h.write(str(companion.session.capi_raw_data).encode(encoding='utf-8')) # def exit_tray(self, systray: 'SysTrayIcon') -> None: # """Tray icon is shutting down.""" diff --git a/companion.py b/companion.py index c3a7000f..36be1756 100644 --- a/companion.py +++ b/companion.py @@ -149,10 +149,13 @@ class CAPIDataRaw: def __str__(self): """Return a more readable string form of the data.""" - capi_data_str = '' + capi_data_str = '{' for e in self.raw_data.keys(): - capi_data_str += f'"{e}":\n{{\n\t"query_time": {self.raw_data[e].query_time},\n\t' \ - f'"raw_data": {self.raw_data[e].raw_data}\n}}\n\n' + capi_data_str += f'"{e}":\n{{\n\t"query_time": "{self.raw_data[e].query_time}",\n\t' \ + f'"raw_data": {self.raw_data[e].raw_data}\n}},\n\n' + + capi_data_str = capi_data_str.removesuffix(',\n\n') + capi_data_str += '\n\n}' return capi_data_str From 1dcefafc73c83c45c8f500b4940e883afd0cf7e3 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 24 Aug 2021 12:41:02 +0100 Subject: [PATCH 042/527] CAPI: Pass tk_response_event in Request to optionally use in response EDMC.py will also need to make CAPI queries using the new threaded method, but it has no tkinter, thus we need to pass in the event name when we expect one to be generated, and only generate it if this is not None. --- EDMarketConnector.py | 3 ++- companion.py | 48 +++++++++++++++++++++++++++++++------------- stats.py | 1 + 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 901eb763..0c9fba61 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -375,6 +375,7 @@ SHIPYARD_HTML_TEMPLATE = """ class AppWindow(object): """Define the main application window.""" + _CAPI_RESPONSE_TK_EVENT_NAME = '<>' # Tkinter Event types EVENT_KEYPRESS = 2 EVENT_BUTTON = 4 @@ -655,7 +656,7 @@ class AppWindow(object): self.w.bind('', self.capi_request_data) self.w.bind('', self.capi_request_data) self.w.bind_all('<>', self.capi_request_data) # Ask for CAPI queries to be performed - self.w.bind_all('<>', self.capi_handle_response) + self.w.bind_all(self._CAPI_RESPONSE_TK_EVENT_NAME, self.capi_handle_response) self.w.bind_all('<>', self.journal_event) # Journal monitoring self.w.bind_all('<>', self.dashboard_event) # Dashboard monitoring self.w.bind_all('<>', self.plugin_error) # Statusbar diff --git a/companion.py b/companion.py index 36be1756..f45e3999 100644 --- a/companion.py +++ b/companion.py @@ -135,7 +135,7 @@ class CAPIDataRawEndpoint: class CAPIDataRaw: - """The last obtained raw CAPI response for each end point.""" + """The last obtained raw CAPI response for each endpoint.""" raw_data: Dict[str, CAPIDataRawEndpoint] = {} @@ -516,9 +516,10 @@ class EDMCCAPIReturn: """Base class for Request, Failure or Response.""" def __init__( - self, query_time: int, retrying: bool = False, - play_sound: bool = False, auto_update: bool = False + self, query_time: int, tk_response_event: Optional[str] = None, + retrying: bool = False, play_sound: bool = False, auto_update: bool = False ): + self.tk_response_event = tk_response_event # Name of tk event to generate when response queued. self.query_time: int = query_time # When this query is considered to have started (time_t). self.retrying: bool = retrying # Whether this is already a retry. self.play_sound: bool = play_sound # Whether to play good/bad sounds for success/failure. @@ -529,10 +530,14 @@ class EDMCCAPIRequest(EDMCCAPIReturn): """Encapsulates a request for CAPI data.""" def __init__( - self, endpoint: str, - query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + self, endpoint: str, query_time: int, + tk_response_event: Optional[str] = None, retrying: bool = False, + play_sound: bool = False, auto_update: bool = False ): - super().__init__(query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + super().__init__( + query_time=query_time, tk_response_event=tk_response_event, retrying=retrying, + play_sound=play_sound, auto_update=auto_update + ) self.endpoint: str = endpoint # The CAPI query to perform. @@ -927,7 +932,10 @@ class Session(object): ) ) - self.tk_master.event_generate('<>') + # If the query came from EDMC.(py|exe) there's no tk to send an + # event too, so assume it will be polling there response queue. + if query.tk_response_event is not None: + self.tk_master.event_generate('<>') logger.info('CAPI worker thread DONE') @@ -936,12 +944,15 @@ class Session(object): self.capi_query_queue.put(None) def query( - self, endpoint: str, - query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + self, endpoint: str, query_time: int, + tk_response_event: Optional[str] = None, retrying: bool = False, + play_sound: bool = False, auto_update: bool = False ) -> None: """ Perform a query against the specified CAPI endpoint. + :param endpoint: The CAPI endpoint to query. + :param tk_response_event: Name of tk event to generate when response queued. :param query_time: When this query was initiated. :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. @@ -950,7 +961,10 @@ class Session(object): logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') if self.state == Session.STATE_INIT: if self.login(): - self.query(endpoint, query_time, play_sound=play_sound, auto_update=auto_update) + self.query( + endpoint, query_time, tk_response_event=tk_response_event, play_sound=play_sound, + auto_update=auto_update + ) return elif self.state == Session.STATE_AUTH: @@ -964,6 +978,7 @@ class Session(object): self.capi_query_queue.put( EDMCCAPIRequest( endpoint=endpoint, + tk_response_event=tk_response_event, retrying=retrying, query_time=query_time, play_sound=play_sound, @@ -973,30 +988,34 @@ class Session(object): def profile( self, - query_time: int = int(time.time()), retrying: bool = False, + query_time: int = int(time.time()), + tk_response_event: Optional[str] = None, retrying: bool = False, play_sound: bool = False, auto_update: bool = False ) -> None: """ Perform general CAPI /profile endpoint query. :param query_time: When this query was initiated. + :param tk_response_event: Name of tk event to generate when response queued. :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ self.query( - self.FRONTIER_CAPI_PATH_PROFILE, query_time=query_time, retrying=retrying, + self.FRONTIER_CAPI_PATH_PROFILE, query_time=query_time, + tk_response_event=tk_response_event, retrying=retrying, play_sound=play_sound, auto_update=auto_update ) def station( - self, - query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + self, query_time: int, tk_response_event: Optional[str] = None, + retrying: bool = False, play_sound: bool = False, auto_update: bool = False ) -> None: """ Perform CAPI quer(y|ies) for station data. :param query_time: When this query was initiated. + :param tk_response_event: Name of tk event to generate when response queued. :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. @@ -1005,6 +1024,7 @@ class Session(object): self.capi_query_queue.put( EDMCCAPIRequest( endpoint=self._CAPI_PATH_STATION, + tk_response_event=tk_response_event, query_time=query_time, retrying=retrying, play_sound=play_sound, diff --git a/stats.py b/stats.py index 6a9c19bf..74f28e9c 100644 --- a/stats.py +++ b/stats.py @@ -281,6 +281,7 @@ class StatsDialog(): self.parent.update_idletasks() try: + # TODO: This should use cached data data = companion.session.profile() except companion.ServerError as e: From 3df688ecd4789c8f42caec65cd3fc5d558f13b8c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 24 Aug 2021 12:43:33 +0100 Subject: [PATCH 043/527] CAPI: Pass in that tk_response_event from AppWindow.capi_request_data() --- EDMarketConnector.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 0c9fba61..1ab27c33 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -936,7 +936,8 @@ class AppWindow(object): query_time = int(time()) logger.trace_if('capi.worker', 'Requesting full station data') companion.session.station( - query_time=query_time, retrying=retrying, play_sound=play_sound + query_time=query_time, tk_response_event=self._CAPI_RESPONSE_TK_EVENT_NAME, + retrying=retrying, play_sound=play_sound ) config.set('querytime', query_time) From 332d4cf97529b93b706b714a77310d6a270f66f1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 24 Aug 2021 12:56:12 +0100 Subject: [PATCH 044/527] CAPI: EDMC - converted to the queue request/response format --- EDMC.py | 37 +++++++++++++++++++++++++++++++++++-- companion.py | 6 +++--- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/EDMC.py b/EDMC.py index 26dc6d7b..9ce0964d 100755 --- a/EDMC.py +++ b/EDMC.py @@ -6,9 +6,11 @@ import argparse import json import locale import os +import queue import re import sys from os.path import getmtime, join +from queue import Queue from time import sleep, time from typing import TYPE_CHECKING, Any, List, Optional @@ -270,9 +272,40 @@ sys.path: {sys.path}''' companion.session.login(monitor.cmdr, monitor.is_beta) + # Set up the response queue + capi_response_queue: Queue = Queue() + companion.session.set_capi_response_queue(capi_response_queue) + + # Initiate CAPI queries querytime = int(time()) - data = companion.session.station() - config.set('querytime', querytime) + companion.session.station(query_time=querytime) + + # Wait for the response + _capi_request_timeout = 60 + try: + capi_response = capi_response_queue.get(block=True, timeout=_capi_request_timeout) + + except queue.Empty: + logger.error(f'CAPI requests timed out after {_capi_request_timeout} seconds') + sys.exit(EXIT_SERVER) + + else: + if isinstance(capi_response, companion.CAPIFailedRequest): + logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') + if capi_response.exception: + raise capi_response.exception + + else: + raise ValueError(capi_response.message) + + logger.trace_if('capi.worker', 'Answer is not a Failure') + if not isinstance(capi_response, companion.EDMCCAPIResponse): + msg = f"Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}" + logger.error(msg) + raise ValueError(msg) + + data = capi_response.capi_data + config.set('querytime', querytime) # Validation if not deep_get(data, 'commander', 'name', default='').strip(): diff --git a/companion.py b/companion.py index f45e3999..f2b88136 100644 --- a/companion.py +++ b/companion.py @@ -587,7 +587,7 @@ class Session(object): self.tk_master: Optional[tk.Tk] = None self.capi_raw_data = CAPIDataRaw() - logger.info('Starting CAPI queries thread...') + logger.debug('Starting CAPI queries thread...') self.capi_response_queue: Queue self.capi_query_queue: Queue = Queue() self.capi_query_thread = threading.Thread( @@ -596,7 +596,7 @@ class Session(object): name='CAPI worker' ) self.capi_query_thread.start() - logger.info('Done') + logger.debug('Done') def set_capi_response_queue(self, capi_response_queue: Queue) -> None: """Set a reference to the CAPI response data queue.""" @@ -711,7 +711,7 @@ class Session(object): ###################################################################### def capi_query_worker(self): # noqa: C901, CCR001 """Worker thread that performs actual CAPI queries.""" - logger.info('CAPI worker thread starting') + logger.debug('CAPI worker thread starting') def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 """ From f12b8be74ce733cd3dde7ead601eb76013112d24 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 24 Aug 2021 13:04:25 +0100 Subject: [PATCH 045/527] EDMC: Fix `-d file` export of CAPI data --- EDMC.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMC.py b/EDMC.py index 9ce0964d..5568b19f 100755 --- a/EDMC.py +++ b/EDMC.py @@ -341,7 +341,7 @@ sys.path: {sys.path}''' # stuff we can do when not docked if args.d: logger.debug(f'Writing raw JSON data to "{args.d}"') - out = json.dumps(data, ensure_ascii=False, indent=2, sort_keys=True, separators=(',', ': ')) + out = json.dumps(dict(data), ensure_ascii=False, indent=2, sort_keys=True, separators=(',', ': ')) with open(args.d, 'wb') as f: f.write(out.encode("utf-8")) From 2e27a2ba00b4f2e5c818775d998942d56218d513 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 24 Aug 2021 13:22:13 +0100 Subject: [PATCH 046/527] CAPIData: Make JSON encodable, and use that elsewhere * It's no use `dict(CAPIData)` if that contains other `CAPIData`. So, rather than write something to do that recursively just implement a simple JSON Encoder class and specify its use. --- companion.py | 10 +++++++++- loadout.py | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index f2b88136..2d83a38c 100644 --- a/companion.py +++ b/companion.py @@ -125,6 +125,14 @@ class CAPIData(UserDict): self.data['lastStarport']['ships'] = {'shipyard_list': {}, 'unavailable_list': []} +class CAPIDataEncoder(json.JSONEncoder): + """Allow for json dumping via specified encoder.""" + + def default(self, o): + """Tell JSON encoder that we're actually just a dict.""" + return o.__dict__ + + class CAPIDataRawEndpoint: """Last received CAPI response for a specific endpoint.""" @@ -1099,7 +1107,7 @@ class Session(object): timestamp = time.strftime('%Y-%m-%dT%H.%M.%S', time.localtime()) with open(f'dump/{system}{station}.{timestamp}.json', 'wb') as h: - h.write(json.dumps(dict(data), + h.write(json.dumps(data, cls=CAPIDataEncoder, ensure_ascii=False, indent=2, sort_keys=True, diff --git a/loadout.py b/loadout.py index 92c9ff3d..dabce54b 100644 --- a/loadout.py +++ b/loadout.py @@ -13,7 +13,10 @@ import util_ships def export(data, filename=None): - string = json.dumps(companion.ship(data), ensure_ascii=False, indent=2, sort_keys=True, separators=(',', ': ')) # pretty print + string = json.dumps( + companion.ship(data), cls=companion.CAPIDataEncoder, + ensure_ascii=False, indent=2, sort_keys=True, separators=(',', ': ') + ) # pretty print if filename: with open(filename, 'wt') as h: From c9d478222ac087bc16948d7f5dac05ce7eb99ad3 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 24 Aug 2021 13:52:48 +0100 Subject: [PATCH 047/527] EDMC: Provide EDDN Odyssey flag from monitor state This should have been set from the latest Journal file, and the key/value is in LoadGame in Odyssey. It's only documented as: "Whether the sending Cmdr has an Odyssey expansion." in the current EDDN Journal schema. Thus sending this as False if the Cmdr last logged into Horizons/base game should be OK. --- EDMC.py | 6 +++--- plugins/eddn.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EDMC.py b/EDMC.py index 5568b19f..4e0428f0 100755 --- a/EDMC.py +++ b/EDMC.py @@ -441,9 +441,9 @@ sys.path: {sys.path}''' try: eddn_sender = eddn.EDDN(None) logger.debug('Sending Market, Outfitting and Shipyard data to EDDN...') - eddn_sender.export_commodities(data, monitor.is_beta) - eddn_sender.export_outfitting(data, monitor.is_beta) - eddn_sender.export_shipyard(data, monitor.is_beta) + eddn_sender.export_commodities(data, monitor.is_beta, monitor.state['Odyssey']) + eddn_sender.export_outfitting(data, monitor.is_beta, monitor.state['Odyssey']) + eddn_sender.export_shipyard(data, monitor.is_beta, monitor.state['Odyssey']) except Exception: logger.exception('Failed to send data to EDDN') diff --git a/plugins/eddn.py b/plugins/eddn.py index 3d0307fa..36a4cb94 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -310,6 +310,7 @@ Msg:\n{msg}''' :param data: a dict containing the starport data :param is_beta: whether or not we're currently in beta mode + :param is_odyssey: whether the account shows as having Odyssey expansion. """ commodities: List[OrderedDictT[str, Any]] = [] for commodity in data['lastStarport'].get('commodities') or []: @@ -790,7 +791,6 @@ def journal_entry( # noqa: C901, CCR001 :param state: `dict` - Current `monitor.state` data. :return: `str` - Error message, or `None` if no errors. """ - should_return, new_data = killswitch.check_killswitch('plugins.eddn.journal', entry) if should_return: plug.show_error(_('EDDN journal handler disabled. See Log.')) # LANG: Killswitch disabled EDDN From 4397acc6fb7367d6c1838a77b65cc55e5900c8b1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 24 Aug 2021 14:06:12 +0100 Subject: [PATCH 048/527] CAPI: Status text when aborting due to CQC (& en.template updated) --- EDMarketConnector.py | 2 + L10n/en.template | 269 ++++++++++++++++++++++--------------------- 2 files changed, 138 insertions(+), 133 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 1ab27c33..ed92bbcf 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -909,6 +909,8 @@ class AppWindow(object): or not monitor.system or monitor.mode == 'CQC' ): logger.trace_if('capi.worker', 'CQC detected, aborting query') + # LANG: CAPI queries aborted because player is in CQC (Arena) + self.status['text'] = _('CQC detected, aborting CAPI query') return # In CQC or on crew - do nothing if companion.session.state == companion.Session.STATE_AUTH: diff --git a/L10n/en.template b/L10n/en.template index f62c5428..2221e523 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -1,172 +1,175 @@ /* Language name */ "!Language" = "English"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:212; */ "Error: Frontier CAPI didn't respond" = "Error: Frontier CAPI didn't respond"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:231; */ "Error: Frontier server is lagging" = "Error: Frontier server is lagging"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:247; */ "Docked but unknown station: EDO Settlement?" = "Docked but unknown station: EDO Settlement?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:257; */ "Error: Invalid Credentials" = "Error: Invalid Credentials"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:273; */ "Error: Wrong Cmdr" = "Error: Wrong Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:397; companion.py:482; */ "Error" = "Error"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:440; companion.py:445; */ "Error: Couldn't check token customer_id" = "Error: Couldn't check token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:451; */ "Error: customer_id doesn't match!" = "Error: customer_id doesn't match!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:473; */ "Error: unable to get token" = "Error: unable to get token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:774; */ "Frontier CAPI query failure" = "Frontier CAPI query failure"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ +/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:786; */ "Frontier CAPI server error" = "Frontier CAPI server error"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:485; EDMarketConnector.py:780; EDMarketConnector.py:1440; */ "Update" = "Update"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:568; prefs.py:866; */ "Always on top" = "Always on top"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:698; */ "Unknown" = "Unknown"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:767; */ "Error: Check E:D journal file location" = "Error: Check E:D journal file location"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:774; edsm.py:257; stats.py:50; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:776; EDMarketConnector.py:1199; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:776; EDMarketConnector.py:1209; EDMarketConnector.py:1232; stats.py:365; */ "Ship" = "Ship"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:777; */ "Suit" = "Suit"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:778; prefs.py:606; stats.py:367; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:779; prefs.py:624; prefs.py:761; stats.py:368; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:782; EDMarketConnector.py:797; EDMarketConnector.py:800; EDMarketConnector.py:1917; */ "File" = "File"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:783; EDMarketConnector.py:798; EDMarketConnector.py:801; */ "Edit" = "Edit"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:784; */ "View" = "View"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:785; */ "Window" = "Window"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:786; EDMarketConnector.py:799; EDMarketConnector.py:802; */ "Help" = "Help"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:789; EDMarketConnector.py:815; EDMarketConnector.py:1486; */ "About {APP}" = "About {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:791; EDMarketConnector.py:814; */ "Check for Updates..." = "Check for Updates..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:792; EDMarketConnector.py:806; */ "Save Raw Data..." = "Save Raw Data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:793; EDMarketConnector.py:805; stats.py:362; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:794; EDMarketConnector.py:812; */ "Privacy Policy" = "Privacy Policy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:795; EDMarketConnector.py:813; EDMarketConnector.py:1520; */ "Release Notes" = "Release Notes"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:807; EDMarketConnector.py:1918; prefs.py:254; */ "Settings" = "Settings"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:808; */ "Exit" = "Exit"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:811; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:818; ttkHyperlinkLabel.py:42; */ "Copy" = "Copy"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:824; */ "Logging in..." = "Logging in..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:840; EDMarketConnector.py:1351; */ "Authentication successful" = "Authentication successful"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:871; */ "You're not docked at a station!" = "You're not docked at a station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:879; */ "Station doesn't have anything!" = "Station doesn't have anything!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:884; */ "Station doesn't have a market!" = "Station doesn't have a market!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:913; */ +"CQC detected, aborting CAPI query" = "CQC detected, aborting CAPI query"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:934; stats.py:280; */ "Fetching data..." = "Fetching data..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:973; */ "CAPI: No commander data returned" = "CAPI: No commander data returned"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:977; stats.py:299; */ "Who are you?!" = "Who are you?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:983; stats.py:309; */ "Where are you?!" = "Where are you?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:990; stats.py:314; */ "What are you flying?!" = "What are you flying?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1145; */ "Last updated at %H:%M:%S" = "Last updated at %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1174; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1175; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1176; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1434; */ "cooldown {SS}s" = "cooldown {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1546; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1611; */ "Shutting down..." = "Shutting down..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1906:1912; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1916; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1927; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -181,7 +184,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignore"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Default"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -214,193 +217,205 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB Journal processing disabled. See Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:225; eddn.py:630; eddn.py:982; */ "Sending data to EDDN..." = "Sending data to EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:274; eddn.py:920; eddn.py:955; eddn.py:994; */ "Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:292; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Error: EDMC is too old for EDDN. Please update."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:298; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Error: Validation Failed (EDMC Too Old?). See Log"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:303; */ "EDDN Error: Returned {STATUS} status code" = "EDDN Error: Returned {STATUS} status code"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:710; */ "Send station data to the Elite Dangerous Data Network" = "Send station data to the Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:721; */ "Send system and scan data to the Elite Dangerous Data Network" = "Send system and scan data to the Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:732; */ "Delay sending until docked" = "Delay sending until docked"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:796; */ "EDDN journal handler disabled. See Log." = "EDDN journal handler disabled. See Log."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Send flight log and Cmdr status to EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map credentials"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Commander Name"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ "None" = "None"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "EDSM Handler disabled. See Log."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Error: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Error: Can't connect to EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Send flight log and Cmdr status to Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara credentials"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara disabled. See Log."; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Error: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Preferences"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Please choose what data to save"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Market data in CSV format file"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Market data in Trade Dangerous format file"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Ship loadout"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automatically update on docking"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "File location"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Change..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Browse..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Output"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D journal file location"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Keyboard shortcut"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Re-start {APP} to use shortcuts"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} needs permission to use shortcuts"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Open System Preferences"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Only when Elite: Dangerous is the active app"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Play sound"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Disable Automatic Application Updates Check when in-game"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Preferred websites"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Shipyard"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Use alternate URL method"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Log Level"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Configuration"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Main UI privacy options"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Hide private group name in UI"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Hide multi-crew captain name"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privacy"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normal text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Highlighted text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Language"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Theme"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Dark"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparent"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "UI Scale Percentage"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 means Default{CR}Restart Required for{CR}changes to take effect!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Main window transparency"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 means fully opaque.{CR}Window is updated in real time"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Appearance"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Plugins folder"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Open"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Enabled Plugins"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Plugins Without Python 3.x Support:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Information on migrating plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Disabled Plugins"; /* stats.py: Cmdr stats; In files: stats.py:51; */ @@ -625,20 +640,8 @@ /* stats.py: Power rank; In files: stats.py:160; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:369; */ "Value" = "Value"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:378; */ "Ships" = "Ships"; - -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ -"Main UI privacy options" = "Main UI privacy options"; - -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ -"Hide private group name in UI" = "Hide private group name in UI"; - -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ -"Hide multi-crew captain name" = "Hide multi-crew captain name"; - -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ -"Privacy" = "Privacy"; From 705d2dd4f160d8a6ac7db4063f6190cedd786812 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 24 Aug 2021 14:52:10 -0400 Subject: [PATCH 049/527] Fix game_runnning() doc in PLUGINS.md --- PLUGINS.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PLUGINS.md b/PLUGINS.md index 5a7388b7..dcb36441 100644 --- a/PLUGINS.md +++ b/PLUGINS.md @@ -83,9 +83,16 @@ from the original files unless specified as allowed in this section. `import plug` - For using `plug.show_error()` only. -`from monitor import game_running` - in case a plugin needs to know if we + Use `monitor.game_running()` as follows in case a plugin needs to know if we think the game is running. *NB: This is a function, and should be called as such. Using the bare word `game_running` will always be `True`.* + +``` +from monitor import monitor +... +if monitor.game_running(): + ... +``` `import timeout_session` - provides a method called `new_session` that creates a requests.session with a default timeout on all requests. Recommended to From 030d79c9da8c9014397c25a8809fc4960987708f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:31:08 +0100 Subject: [PATCH 050/527] EDMC: De-indent CAPI response checks --- EDMC.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/EDMC.py b/EDMC.py index 4e0428f0..842e0a33 100755 --- a/EDMC.py +++ b/EDMC.py @@ -289,23 +289,23 @@ sys.path: {sys.path}''' logger.error(f'CAPI requests timed out after {_capi_request_timeout} seconds') sys.exit(EXIT_SERVER) - else: - if isinstance(capi_response, companion.CAPIFailedRequest): - logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') - if capi_response.exception: - raise capi_response.exception + # noinspection DuplicatedCode + if isinstance(capi_response, companion.CAPIFailedRequest): + logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') + if capi_response.exception: + raise capi_response.exception - else: - raise ValueError(capi_response.message) + else: + raise ValueError(capi_response.message) - logger.trace_if('capi.worker', 'Answer is not a Failure') - if not isinstance(capi_response, companion.EDMCCAPIResponse): - msg = f"Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}" - logger.error(msg) - raise ValueError(msg) + logger.trace_if('capi.worker', 'Answer is not a Failure') + if not isinstance(capi_response, companion.EDMCCAPIResponse): + msg = f"Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}" + logger.error(msg) + raise ValueError(msg) - data = capi_response.capi_data - config.set('querytime', querytime) + data = capi_response.capi_data + config.set('querytime', querytime) # Validation if not deep_get(data, 'commander', 'name', default='').strip(): From 5710f3fd610c74aa2b608e4f50819b5031c6fbbc Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:33:52 +0100 Subject: [PATCH 051/527] CAPI: Only `import queue` in EDMarketConnector.py --- EDMarketConnector.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index ed92bbcf..5afc16b3 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -14,7 +14,6 @@ import webbrowser from builtins import object, str from os import chdir, environ from os.path import dirname, join -from queue import Queue from sys import platform from time import localtime, strftime, time from typing import TYPE_CHECKING, Optional, Tuple, Union @@ -386,7 +385,7 @@ class AppWindow(object): def __init__(self, master: tk.Tk): # noqa: C901, CCR001 # TODO - can possibly factor something out self.capi_query_holdoff_time = config.get_int('querytime', default=0) + companion.capi_query_cooldown - self.capi_response_queue: Queue = Queue() + self.capi_response_queue: queue.Queue = queue.Queue() companion.session.set_capi_response_queue(self.capi_response_queue) self.w = master From dad2f95f64671c188f84d16bb8cde6e064062bb0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:34:51 +0100 Subject: [PATCH 052/527] EDMarketConnector: Correct arg to tk overrideredirect to bool --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 5afc16b3..2845844d 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1670,7 +1670,7 @@ class AppWindow(object): def oniconify(self, event=None) -> None: """Handle minimization of the application.""" - self.w.overrideredirect(0) # Can't iconize while overrideredirect + self.w.overrideredirect(False) # Can't iconize while overrideredirect self.w.iconify() self.w.update_idletasks() # Size and windows styles get recalculated here self.w.wait_visibility() # Need main window to be re-created before returning From 0456996cdd74fdb2e0ccf288a5eb98c6f947f44f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:36:39 +0100 Subject: [PATCH 053/527] EDMarketConnector: Save querytime to config *before* triggering API --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 2845844d..940b4a40 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -936,11 +936,11 @@ class AppWindow(object): query_time = int(time()) logger.trace_if('capi.worker', 'Requesting full station data') + config.set('querytime', query_time) companion.session.station( query_time=query_time, tk_response_event=self._CAPI_RESPONSE_TK_EVENT_NAME, retrying=retrying, play_sound=play_sound ) - config.set('querytime', query_time) def capi_handle_response(self, event=None): # noqa: C901, CCR001 """Handle the resulting data from a CAPI query.""" From 69d0d03b9b81bfe0cd8052ef466a60f326ec5e3d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:42:53 +0100 Subject: [PATCH 054/527] CAPI: Rename to EDMCCAPIFailedRequest & comment queues * The 'EDMC' prefix on all these classes is to make it clear they're for internal passing around of requests/responses, rather than holding the literal raw CAPI request and response. * The request and response queues are now commented, including the detail that the response queue is created by the caller and then set 'here' by Session.set_capi_response_queue(). --- EDMC.py | 2 +- EDMarketConnector.py | 4 ++-- companion.py | 19 +++++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/EDMC.py b/EDMC.py index 842e0a33..cfd019e5 100755 --- a/EDMC.py +++ b/EDMC.py @@ -290,7 +290,7 @@ sys.path: {sys.path}''' sys.exit(EXIT_SERVER) # noinspection DuplicatedCode - if isinstance(capi_response, companion.CAPIFailedRequest): + if isinstance(capi_response, companion.EDMCCAPIFailedRequest): logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') if capi_response.exception: raise capi_response.exception diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 940b4a40..6ec7b32c 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -947,11 +947,11 @@ class AppWindow(object): play_bad: bool = False err: Optional[str] = None - capi_response: Union[companion.CAPIFailedRequest, companion.EDMCCAPIResponse] + capi_response: Union[companion.EDMCCAPIFailedRequest, companion.EDMCCAPIResponse] try: logger.trace_if('capi.worker', 'Pulling answer off queue') capi_response = self.capi_response_queue.get(block=False) - if isinstance(capi_response, companion.CAPIFailedRequest): + if isinstance(capi_response, companion.EDMCCAPIFailedRequest): logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') if capi_response.exception: raise capi_response.exception diff --git a/companion.py b/companion.py index 2d83a38c..85a4e4f6 100644 --- a/companion.py +++ b/companion.py @@ -560,7 +560,7 @@ class EDMCCAPIResponse(EDMCCAPIReturn): self.capi_data: CAPIData = capi_data # Frontier CAPI response, possibly augmented (station query) -class CAPIFailedRequest(EDMCCAPIReturn): +class EDMCCAPIFailedRequest(EDMCCAPIReturn): """CAPI failed query error class.""" def __init__( @@ -594,10 +594,17 @@ class Session(object): self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query self.tk_master: Optional[tk.Tk] = None - self.capi_raw_data = CAPIDataRaw() - logger.debug('Starting CAPI queries thread...') - self.capi_response_queue: Queue + self.capi_raw_data = CAPIDataRaw() # Cache of raw replies from CAPI service + # Queue that holds requests for CAPI queries, the items should always + # be EDMCCAPIRequest objects. self.capi_query_queue: Queue = Queue() + # This queue is used to pass the result, possibly a failure, of CAPI + # queries back to the requesting code (technically anything checking + # this queue, but it should be either EDMarketConnector.AppWindow or + # EDMC.py). Items may be EDMCCAPIResponse or EDMCCAPIFailedRequest. + # NB: This is created by the caller and set using self.set_capi_response_queue(). + self.capi_response_queue: Queue + logger.debug('Starting CAPI queries thread...') self.capi_query_thread = threading.Thread( target=self.capi_query_worker, daemon=True, @@ -893,7 +900,7 @@ class Session(object): except Exception as e: self.capi_response_queue.put( ( - CAPIFailedRequest( + EDMCCAPIFailedRequest( message=e.args, exception=e, query_time=query.query_time, @@ -920,7 +927,7 @@ class Session(object): except Exception as e: self.capi_response_queue.put( ( - CAPIFailedRequest( + EDMCCAPIFailedRequest( message=e.args, exception=e, query_time=query.query_time, From e1c6a0e9f87b4bf9fc5a68ba221d9fd971c973e9 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:50:56 +0100 Subject: [PATCH 055/527] CAPI: Create response queue in companion.Session No need to create in callers and then use setter. --- EDMC.py | 9 +++------ EDMarketConnector.py | 4 +--- companion.py | 7 +------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/EDMC.py b/EDMC.py index cfd019e5..ab65d726 100755 --- a/EDMC.py +++ b/EDMC.py @@ -10,7 +10,6 @@ import queue import re import sys from os.path import getmtime, join -from queue import Queue from time import sleep, time from typing import TYPE_CHECKING, Any, List, Optional @@ -272,10 +271,6 @@ sys.path: {sys.path}''' companion.session.login(monitor.cmdr, monitor.is_beta) - # Set up the response queue - capi_response_queue: Queue = Queue() - companion.session.set_capi_response_queue(capi_response_queue) - # Initiate CAPI queries querytime = int(time()) companion.session.station(query_time=querytime) @@ -283,7 +278,9 @@ sys.path: {sys.path}''' # Wait for the response _capi_request_timeout = 60 try: - capi_response = capi_response_queue.get(block=True, timeout=_capi_request_timeout) + capi_response = companion.session.capi_response_queue.get( + block=True, timeout=_capi_request_timeout + ) except queue.Empty: logger.error(f'CAPI requests timed out after {_capi_request_timeout} seconds') diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 6ec7b32c..b82bfe98 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -385,8 +385,6 @@ class AppWindow(object): def __init__(self, master: tk.Tk): # noqa: C901, CCR001 # TODO - can possibly factor something out self.capi_query_holdoff_time = config.get_int('querytime', default=0) + companion.capi_query_cooldown - self.capi_response_queue: queue.Queue = queue.Queue() - companion.session.set_capi_response_queue(self.capi_response_queue) self.w = master self.w.title(applongname) @@ -950,7 +948,7 @@ class AppWindow(object): capi_response: Union[companion.EDMCCAPIFailedRequest, companion.EDMCCAPIResponse] try: logger.trace_if('capi.worker', 'Pulling answer off queue') - capi_response = self.capi_response_queue.get(block=False) + capi_response = companion.session.capi_response_queue.get(block=False) if isinstance(capi_response, companion.EDMCCAPIFailedRequest): logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') if capi_response.exception: diff --git a/companion.py b/companion.py index 85a4e4f6..4315a57c 100644 --- a/companion.py +++ b/companion.py @@ -602,8 +602,7 @@ class Session(object): # queries back to the requesting code (technically anything checking # this queue, but it should be either EDMarketConnector.AppWindow or # EDMC.py). Items may be EDMCCAPIResponse or EDMCCAPIFailedRequest. - # NB: This is created by the caller and set using self.set_capi_response_queue(). - self.capi_response_queue: Queue + self.capi_response_queue: Queue = Queue() logger.debug('Starting CAPI queries thread...') self.capi_query_thread = threading.Thread( target=self.capi_query_worker, @@ -613,10 +612,6 @@ class Session(object): self.capi_query_thread.start() logger.debug('Done') - def set_capi_response_queue(self, capi_response_queue: Queue) -> None: - """Set a reference to the CAPI response data queue.""" - self.capi_response_queue = capi_response_queue - def set_tk_master(self, master: tk.Tk) -> None: """Set a reference to main UI Tk root window.""" self.tk_master = master From 027455984b816f7bb7ef01f9210da29b36aad9d5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:53:04 +0100 Subject: [PATCH 056/527] CAPI: EDMCCAPIFailedRequest itself, not inside a tuple * Also str(e.args) when setting the message. --- companion.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/companion.py b/companion.py index 4315a57c..93337fea 100644 --- a/companion.py +++ b/companion.py @@ -894,14 +894,12 @@ class Session(object): except Exception as e: self.capi_response_queue.put( - ( - EDMCCAPIFailedRequest( - message=e.args, - exception=e, - query_time=query.query_time, - play_sound=query.play_sound, - auto_update=query.auto_update - ), + EDMCCAPIFailedRequest( + message=str(e.args), + exception=e, + query_time=query.query_time, + play_sound=query.play_sound, + auto_update=query.auto_update ) ) From 26caf76cf4ea11a917cab96e2fe4516f7e46b5c8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 11:56:32 +0100 Subject: [PATCH 057/527] CAPI: Declare request/response queue member types --- companion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index 93337fea..a49a1a38 100644 --- a/companion.py +++ b/companion.py @@ -597,12 +597,12 @@ class Session(object): self.capi_raw_data = CAPIDataRaw() # Cache of raw replies from CAPI service # Queue that holds requests for CAPI queries, the items should always # be EDMCCAPIRequest objects. - self.capi_query_queue: Queue = Queue() + self.capi_query_queue: Queue[Optional[EDMCCAPIRequest]] = Queue() # This queue is used to pass the result, possibly a failure, of CAPI # queries back to the requesting code (technically anything checking # this queue, but it should be either EDMarketConnector.AppWindow or # EDMC.py). Items may be EDMCCAPIResponse or EDMCCAPIFailedRequest. - self.capi_response_queue: Queue = Queue() + self.capi_response_queue: Queue[Union[EDMCCAPIResponse, EDMCCAPIFailedRequest]] = Queue() logger.debug('Starting CAPI queries thread...') self.capi_query_thread = threading.Thread( target=self.capi_query_worker, From 503658bf4ed09a56446275400ba32f2c8e4dba01 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 12:04:13 +0100 Subject: [PATCH 058/527] companion: Correct Session.profile(query_time) default --- companion.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/companion.py b/companion.py index a49a1a38..8d78b619 100644 --- a/companion.py +++ b/companion.py @@ -996,7 +996,7 @@ class Session(object): def profile( self, - query_time: int = int(time.time()), + query_time: int = 0, tk_response_event: Optional[str] = None, retrying: bool = False, play_sound: bool = False, auto_update: bool = False ) -> None: @@ -1009,6 +1009,9 @@ class Session(object): :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ + if query_time == 0: + query_time = int(time.time()) + self.query( self.FRONTIER_CAPI_PATH_PROFILE, query_time=query_time, tk_response_event=tk_response_event, retrying=retrying, From 40a8a19ce4cb21fcea332cb1eb586c7f3775830e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 12:14:33 +0100 Subject: [PATCH 059/527] CAPI: Use special EDMCCAPIRequest endpoint, not 'None' for worker shutdown --- companion.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/companion.py b/companion.py index 8d78b619..5528262c 100644 --- a/companion.py +++ b/companion.py @@ -537,6 +537,8 @@ class EDMCCAPIReturn: class EDMCCAPIRequest(EDMCCAPIReturn): """Encapsulates a request for CAPI data.""" + REQUEST_WORKER_SHUTDOWN = '__EDMC_WORKER_SHUTDOWN' + def __init__( self, endpoint: str, query_time: int, tk_response_event: Optional[str] = None, retrying: bool = False, @@ -597,7 +599,7 @@ class Session(object): self.capi_raw_data = CAPIDataRaw() # Cache of raw replies from CAPI service # Queue that holds requests for CAPI queries, the items should always # be EDMCCAPIRequest objects. - self.capi_query_queue: Queue[Optional[EDMCCAPIRequest]] = Queue() + self.capi_request_queue: Queue[EDMCCAPIRequest] = Queue() # This queue is used to pass the result, possibly a failure, of CAPI # queries back to the requesting code (technically anything checking # this queue, but it should be either EDMarketConnector.AppWindow or @@ -876,15 +878,14 @@ class Session(object): return station_data while True: - query = self.capi_query_queue.get() + query = self.capi_request_queue.get() if not isinstance(query, EDMCCAPIRequest): - if query is not None: - logger.error("Item from queue wasn't an EDMCCAPIRequest") - break + logger.error("Item from queue wasn't an EDMCCAPIRequest") + break - else: - logger.info('Empty queue message, exiting...') - break + if query.endpoint == query.REQUEST_WORKER_SHUTDOWN: + logger.info(f'endpoint {query.REQUEST_WORKER_SHUTDOWN}, exiting...') + break logger.trace_if('capi.worker', f'Processing query: {query.endpoint}') capi_data: CAPIData @@ -949,7 +950,12 @@ class Session(object): def capi_query_close_worker(self) -> None: """Ask the CAPI query thread to finish.""" - self.capi_query_queue.put(None) + self.capi_request_queue.put( + EDMCCAPIRequest( + endpoint=EDMCCAPIRequest.REQUEST_WORKER_SHUTDOWN, + query_time=int(time.time()) + ) + ) def query( self, endpoint: str, query_time: int, @@ -983,7 +989,7 @@ class Session(object): if conf_module.capi_pretend_down: raise ServerConnectionError(f'Pretending CAPI down: {endpoint}') - self.capi_query_queue.put( + self.capi_request_queue.put( EDMCCAPIRequest( endpoint=endpoint, tk_response_event=tk_response_event, @@ -1032,7 +1038,7 @@ class Session(object): :param auto_update: Whether this request was triggered automatically. """ # Ask the thread worker to perform all three queries - self.capi_query_queue.put( + self.capi_request_queue.put( EDMCCAPIRequest( endpoint=self._CAPI_PATH_STATION, tk_response_event=tk_response_event, From a48c33eda873e596d5922f874a50b23c7415e0c4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 13:45:42 +0100 Subject: [PATCH 060/527] companion: Change record_endpoint() query_time to mandatory This *does* need to be generated as close as possible to where the data was received, and not rely on an actually not dynamic default. --- companion.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index 5528262c..fe112f5a 100644 --- a/companion.py +++ b/companion.py @@ -150,7 +150,7 @@ class CAPIDataRaw: def record_endpoint( self, endpoint: str, raw_data: str, - query_time: datetime.datetime = datetime.datetime.utcnow() + query_time: datetime.datetime ): """Record the latest raw data for the given endpoint.""" self.raw_data[endpoint] = CAPIDataRawEndpoint(raw_data, query_time) @@ -740,7 +740,10 @@ class Session(object): # May also fail here if token expired since response is empty capi_json = r.json() capi_data = CAPIData(capi_json, capi_endpoint) - self.capi_raw_data.record_endpoint(capi_endpoint, r.content.decode(encoding='utf-8')) + self.capi_raw_data.record_endpoint( + capi_endpoint, r.content.decode(encoding='utf-8'), + datetime.datetime.utcnow() + ) except requests.ConnectionError as e: logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {capi_endpoint})') From 6089dc6b0e815d0fe80b3b3a75640e7e14039702 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 13:48:32 +0100 Subject: [PATCH 061/527] companion: Optional[bool], not Union & minor `if` formatting --- companion.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/companion.py b/companion.py index fe112f5a..11b0b1a0 100644 --- a/companion.py +++ b/companion.py @@ -629,7 +629,7 @@ class Session(object): self.session.headers['User-Agent'] = USER_AGENT self.state = Session.STATE_OK - def login(self, cmdr: str = None, is_beta: Union[None, bool] = None) -> bool: + def login(self, cmdr: str = None, is_beta: Optional[bool] = None) -> bool: """ Attempt oAuth2 login. @@ -830,8 +830,10 @@ class Session(object): logger.error("No lastStarport in data!") return station_data - if ((last_starport_name := last_starport.get('name')) is None - or last_starport_name == ''): + if ( + (last_starport_name := last_starport.get('name')) is None + or last_starport_name == '' + ): # This could well be valid if you've been out exploring for a long # time. logger.warning("No lastStarport name!") From 7e1e35fd48547b985d8f059ba65f7523fb3c27b7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 13:49:25 +0100 Subject: [PATCH 062/527] companion: Don't `self.capi_response_queue.put()` a tuple --- companion.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/companion.py b/companion.py index 11b0b1a0..a1d7b391 100644 --- a/companion.py +++ b/companion.py @@ -925,14 +925,12 @@ class Session(object): except Exception as e: self.capi_response_queue.put( - ( - EDMCCAPIFailedRequest( - message=e.args, - exception=e, - query_time=query.query_time, - play_sound=query.play_sound, - auto_update=query.auto_update - ), + EDMCCAPIFailedRequest( + message=e.args, + exception=e, + query_time=query.query_time, + play_sound=query.play_sound, + auto_update=query.auto_update ) ) From 120414ac59bb8ca2f1326f64a48cb4941e3a0267 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 14:08:36 +0100 Subject: [PATCH 063/527] CAPI: Convert StatsDialog.showstats() to using cached CAPI data This will just bail if no data has yet been received for /profile, but that's the same behaviour as if we don't yet have `monitor.cmdr`. --- companion.py | 8 ++++++++ stats.py | 37 ++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/companion.py b/companion.py index a1d7b391..a6e80345 100644 --- a/companion.py +++ b/companion.py @@ -167,6 +167,14 @@ class CAPIDataRaw: return capi_data_str + def __iter__(self): + """Make this iterable on its raw_data dict.""" + yield from self.raw_data + + def __getitem__(self, item): + """Make the raw_data dict's items get'able.""" + return self.raw_data.get(item) + def listify(thing: Union[List, Dict]) -> List: """ diff --git a/stats.py b/stats.py index 74f28e9c..89e79d9a 100644 --- a/stats.py +++ b/stats.py @@ -1,5 +1,6 @@ """CMDR Status information.""" import csv +import json import tkinter import tkinter as tk from sys import platform @@ -276,46 +277,40 @@ class StatsDialog(): return # TODO: This needs to use cached data - # LANG: Fetching data from Frontier CAPI in order to display on File > Status - self.status['text'] = _('Fetching data...') - self.parent.update_idletasks() - - try: - # TODO: This should use cached data - data = companion.session.profile() - - except companion.ServerError as e: - self.status['text'] = str(e) + if companion.session.FRONTIER_CAPI_PATH_PROFILE not in companion.session.capi_raw_data: + logger.info('No cached data, aborting...') return - except Exception as e: - logger.exception("error while attempting to show status") - self.status['text'] = str(e) - return + capi_data = json.loads( + companion.session.capi_raw_data[companion.session.FRONTIER_CAPI_PATH_PROFILE].raw_data + ) - if not data.get('commander') or not data['commander'].get('name', '').strip(): + if not capi_data.get('commander') or not capi_data['commander'].get('name', '').strip(): # Shouldn't happen # LANG: Unknown commander self.status['text'] = _("Who are you?!") elif ( - not data.get('lastSystem') - or not data['lastSystem'].get('name', '').strip() - or not data.get('lastStarport') - or not data['lastStarport'].get('name', '').strip() + not capi_data.get('lastSystem') + or not capi_data['lastSystem'].get('name', '').strip() + or not capi_data.get('lastStarport') + or not capi_data['lastStarport'].get('name', '').strip() ): # Shouldn't happen # LANG: Unknown location self.status['text'] = _("Where are you?!") - elif not data.get('ship') or not data['ship'].get('modules') or not data['ship'].get('name', '').strip(): + elif ( + not capi_data.get('ship') or not capi_data['ship'].get('modules') + or not capi_data['ship'].get('name', '').strip() + ): # Shouldn't happen # LANG: Unknown ship self.status['text'] = _("What are you flying?!") else: self.status['text'] = '' - StatsResults(self.parent, data) + StatsResults(self.parent, capi_data) class StatsResults(tk.Toplevel): From 05a95fbac446168fe08624706a56d9c4cf23cda6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 14:23:14 +0100 Subject: [PATCH 064/527] companion: Update WTF comment about login/beta This is probably a left-over from the days of email+password login, not wanting to send that to anything but live CAPI server ? --- companion.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/companion.py b/companion.py index a6e80345..aa305b9f 100644 --- a/companion.py +++ b/companion.py @@ -648,6 +648,8 @@ class Session(object): raise CredentialsError('cannot login without a valid Client ID') # TODO: WTF is the intent behind this logic ? + # Perhaps to do with not even trying to auth if we're not sure if + # it's beta, but that's moot for *auth* since oAuth2. if not cmdr or is_beta is None: # Use existing credentials if not self.credentials: From 2065721dd9b5c59766eb9373ffa78e125c090168 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 14:47:15 +0100 Subject: [PATCH 065/527] CAPI: Store request `retrying` in companion.session.retrying The code was already referencing the latter, just we weren't setting it from the request yet. --- companion.py | 1 + 1 file changed, 1 insertion(+) diff --git a/companion.py b/companion.py index aa305b9f..2d6d6036 100644 --- a/companion.py +++ b/companion.py @@ -903,6 +903,7 @@ class Session(object): break logger.trace_if('capi.worker', f'Processing query: {query.endpoint}') + self.retrying = query.retrying capi_data: CAPIData if query.endpoint == self._CAPI_PATH_STATION: try: From baac45f5fe7c793dd31467b7053798c7011d4bd7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 14:54:53 +0100 Subject: [PATCH 066/527] CAPI: Some extra comments for fail/auth mess --- companion.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/companion.py b/companion.py index 2d6d6036..76ac3240 100644 --- a/companion.py +++ b/companion.py @@ -762,10 +762,13 @@ class Session(object): except (requests.HTTPError, ValueError) as e: logger.exception('Frontier CAPI Auth: GET ') self.dump(r) + # TODO: Does this *necessarily* mean we need to call close() ? + # Maybe the **CAPI** had a transitory issue and auth is fine. self.close() if self.retrying: # Refresh just succeeded but this query failed! Force full re-authentication logger.error('Frontier CAPI Auth: query failed after refresh') + # TODO: Again, this might be an auth issue, but maybe not. self.invalidate() self.retrying = False # TODO: This must NOT happen here, we need to signal back to the requesting From 303df05f2cce678c366ea777c3c77ed5e8536d9c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 25 Aug 2021 14:57:08 +0100 Subject: [PATCH 067/527] CAPI: Adjust 'requests.ConnectionError' logging It was specifically implying DNS resolution issues, but this is far more general than that. --- companion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion.py b/companion.py index 76ac3240..50163125 100644 --- a/companion.py +++ b/companion.py @@ -756,7 +756,7 @@ class Session(object): ) except requests.ConnectionError as e: - logger.warning(f'Unable to resolve name for CAPI: {e} (for request: {capi_endpoint})') + logger.warning(f'Request {capi_endpoint}: {e}') raise ServerConnectionError(f'Unable to connect to endpoint: {capi_endpoint}') from e except (requests.HTTPError, ValueError) as e: From 5e5169da511df4eb8b48d4a52eae7a8b1fe86046 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 25 Aug 2021 15:03:19 -0400 Subject: [PATCH 068/527] Fix shutting_down example in plugins.md --- PLUGINS.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PLUGINS.md b/PLUGINS.md index dcb36441..805094be 100644 --- a/PLUGINS.md +++ b/PLUGINS.md @@ -326,9 +326,9 @@ should treat it as a variable. **Do NOT use**: ```python - from config import shutting_down + from config import config - if shutting_down(): + if config.shutting_down(): # During shutdown ``` @@ -338,9 +338,9 @@ this context you're testing if the function exists, and that is always True. So instead use: ```python - from config import shutting_down + from config import config - if shutting_down: + if config.shutting_down: # During shutdown ``` From 816384f16fe41174083df9add81eb714e1346d6d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 14:44:43 +0100 Subject: [PATCH 069/527] CAPI: Begin taking auth retries out of CAPI queries * Only set/use retrying as companion.session.retrying (untested). * Don't call Session.login() from CAPI query code, raise CredentialsError instead. * Also don't Session.close() in CAPI query code. --- EDMarketConnector.py | 13 ++++++----- companion.py | 51 +++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index b82bfe98..6fef5579 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -891,12 +891,14 @@ class AppWindow(object): return True - def capi_request_data(self, event=None, retrying: bool = False): + def capi_request_data(self, event=None) -> None: """ Perform CAPI data retrieval and associated actions. This can be triggered by hitting the main UI 'Update' button, automatically on docking, or due to a retry. + + :param event: Tk generated event details. """ auto_update = not event play_sound = (auto_update or int(event.type) == self.EVENT_VIRTUAL) and not config.get_int('hotkey_mute') @@ -916,7 +918,7 @@ class AppWindow(object): self.login() return - if not retrying: + if not companion.session.retrying: if time() < self.capi_query_holdoff_time: # Was invoked by key while in cooldown if play_sound and (self.capi_query_holdoff_time - time()) < companion.capi_query_cooldown * 0.75: self.status['text'] = '' @@ -937,7 +939,7 @@ class AppWindow(object): config.set('querytime', query_time) companion.session.station( query_time=query_time, tk_response_event=self._CAPI_RESPONSE_TK_EVENT_NAME, - retrying=retrying, play_sound=play_sound + play_sound=play_sound ) def capi_handle_response(self, event=None): # noqa: C901, CCR001 @@ -1112,13 +1114,14 @@ class AppWindow(object): # Companion API problem except companion.ServerLagging as e: err = str(e) - if capi_response.retrying: + if companion.session.retrying: self.status['text'] = err play_bad = True else: # Retry once if Companion server is unresponsive - self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event, True)) + companion.session.retrying = True + self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event)) return # early exit to avoid starting cooldown count except companion.CmdrError as e: # Companion API return doesn't match Journal diff --git a/companion.py b/companion.py index 50163125..90d49579 100644 --- a/companion.py +++ b/companion.py @@ -533,11 +533,10 @@ class EDMCCAPIReturn: def __init__( self, query_time: int, tk_response_event: Optional[str] = None, - retrying: bool = False, play_sound: bool = False, auto_update: bool = False + play_sound: bool = False, auto_update: bool = False ): self.tk_response_event = tk_response_event # Name of tk event to generate when response queued. self.query_time: int = query_time # When this query is considered to have started (time_t). - self.retrying: bool = retrying # Whether this is already a retry. self.play_sound: bool = play_sound # Whether to play good/bad sounds for success/failure. self.auto_update: bool = auto_update # Whether this was automatically triggered. @@ -549,11 +548,11 @@ class EDMCCAPIRequest(EDMCCAPIReturn): def __init__( self, endpoint: str, query_time: int, - tk_response_event: Optional[str] = None, retrying: bool = False, + tk_response_event: Optional[str] = None, play_sound: bool = False, auto_update: bool = False ): super().__init__( - query_time=query_time, tk_response_event=tk_response_event, retrying=retrying, + query_time=query_time, tk_response_event=tk_response_event, play_sound=play_sound, auto_update=auto_update ) self.endpoint: str = endpoint # The CAPI query to perform. @@ -564,9 +563,9 @@ class EDMCCAPIResponse(EDMCCAPIReturn): def __init__( self, capi_data: CAPIData, - query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False + query_time: int, play_sound: bool = False, auto_update: bool = False ): - super().__init__(query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + super().__init__(query_time=query_time, play_sound=play_sound, auto_update=auto_update) self.capi_data: CAPIData = capi_data # Frontier CAPI response, possibly augmented (station query) @@ -575,10 +574,10 @@ class EDMCCAPIFailedRequest(EDMCCAPIReturn): def __init__( self, message: str, - query_time: int, retrying: bool = False, play_sound: bool = False, auto_update: bool = False, + query_time: int, play_sound: bool = False, auto_update: bool = False, exception=None ): - super().__init__(query_time=query_time, retrying=retrying, play_sound=play_sound, auto_update=auto_update) + super().__init__(query_time=query_time, play_sound=play_sound, auto_update=auto_update) self.message: str = message # User-friendly reason for failure. self.exception: int = exception # Exception that recipient should raise. @@ -759,21 +758,16 @@ class Session(object): logger.warning(f'Request {capi_endpoint}: {e}') raise ServerConnectionError(f'Unable to connect to endpoint: {capi_endpoint}') from e - except (requests.HTTPError, ValueError) as e: - logger.exception('Frontier CAPI Auth: GET ') + except requests.HTTPError as e: # In response to raise_for_status() + logger.exception(f'Frontier CAPI Auth: GET {capi_endpoint}') self.dump(r) - # TODO: Does this *necessarily* mean we need to call close() ? - # Maybe the **CAPI** had a transitory issue and auth is fine. - self.close() + + if r.status_code == 401: # CAPI doesn't think we're Auth'd + # TODO: Translation ? + raise CredentialsError('Frontier CAPI said Auth required') from e if self.retrying: # Refresh just succeeded but this query failed! Force full re-authentication - logger.error('Frontier CAPI Auth: query failed after refresh') - # TODO: Again, this might be an auth issue, but maybe not. - self.invalidate() self.retrying = False - # TODO: This must NOT happen here, we need to signal back to the requesting - # code that it needs to sort out auth. - self.login() raise CredentialsError('query failed after refresh') from e # TODO: Better to return error and have upstream re-try auth ? @@ -788,6 +782,11 @@ class Session(object): logger.error('Frontier CAPI Auth: HTTP error or invalid JSON') raise CredentialsError('HTTP error or invalid JSON') from e + except ValueError as e: + logger.exception(f'decoding CAPI response content:\n{r.content.decode(encoding="utf-8")}\n') + # TODO: What now ? + raise ServerError("Couldn't JSON decode CAPI response") from e + except Exception as e: logger.debug('Attempting GET', exc_info=e) # LANG: Frontier CAPI data retrieval failed @@ -906,7 +905,6 @@ class Session(object): break logger.trace_if('capi.worker', f'Processing query: {query.endpoint}') - self.retrying = query.retrying capi_data: CAPIData if query.endpoint == self._CAPI_PATH_STATION: try: @@ -976,7 +974,7 @@ class Session(object): def query( self, endpoint: str, query_time: int, - tk_response_event: Optional[str] = None, retrying: bool = False, + tk_response_event: Optional[str] = None, play_sound: bool = False, auto_update: bool = False ) -> None: """ @@ -985,7 +983,6 @@ class Session(object): :param endpoint: The CAPI endpoint to query. :param tk_response_event: Name of tk event to generate when response queued. :param query_time: When this query was initiated. - :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ @@ -1010,7 +1007,6 @@ class Session(object): EDMCCAPIRequest( endpoint=endpoint, tk_response_event=tk_response_event, - retrying=retrying, query_time=query_time, play_sound=play_sound, auto_update=auto_update @@ -1020,7 +1016,7 @@ class Session(object): def profile( self, query_time: int = 0, - tk_response_event: Optional[str] = None, retrying: bool = False, + tk_response_event: Optional[str] = None, play_sound: bool = False, auto_update: bool = False ) -> None: """ @@ -1028,7 +1024,6 @@ class Session(object): :param query_time: When this query was initiated. :param tk_response_event: Name of tk event to generate when response queued. - :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ @@ -1037,20 +1032,19 @@ class Session(object): self.query( self.FRONTIER_CAPI_PATH_PROFILE, query_time=query_time, - tk_response_event=tk_response_event, retrying=retrying, + tk_response_event=tk_response_event, play_sound=play_sound, auto_update=auto_update ) def station( self, query_time: int, tk_response_event: Optional[str] = None, - retrying: bool = False, play_sound: bool = False, auto_update: bool = False + play_sound: bool = False, auto_update: bool = False ) -> None: """ Perform CAPI quer(y|ies) for station data. :param query_time: When this query was initiated. :param tk_response_event: Name of tk event to generate when response queued. - :param retrying: Whether this is a retry. :param play_sound: Whether the app should play a sound on error. :param auto_update: Whether this request was triggered automatically. """ @@ -1060,7 +1054,6 @@ class Session(object): endpoint=self._CAPI_PATH_STATION, tk_response_event=tk_response_event, query_time=query_time, - retrying=retrying, play_sound=play_sound, auto_update=auto_update ) From a53858750c1606f34b31cbff285001064d24942e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 14:52:47 +0100 Subject: [PATCH 070/527] CAPI: query errors: Continue taking auth-related reactions out --- companion.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/companion.py b/companion.py index 90d49579..b1f76ae8 100644 --- a/companion.py +++ b/companion.py @@ -766,21 +766,18 @@ class Session(object): # TODO: Translation ? raise CredentialsError('Frontier CAPI said Auth required') from e - if self.retrying: # Refresh just succeeded but this query failed! Force full re-authentication - self.retrying = False - raise CredentialsError('query failed after refresh') from e + if r.status_code == 418: # "I'm a teapot" - used to signal maintenance + # TODO: Translation ? + raise ServerError("Frontier CAPI down for maintenance") from e + + # TODO: Let caller decide on this + # if self.retrying: # Refresh just succeeded but this query failed! Force full re-authentication + # self.retrying = False + # raise CredentialsError('query failed after refresh') from e # TODO: Better to return error and have upstream re-try auth ? - elif self.login(): # Maybe our token expired. Re-authorize in any case - logger.debug('Initial query failed, but login() just worked, trying again...') - self.retrying = True - # TODO: This, or raise (custom?) exception for upstream to do it? - return capi_single_query(capi_endpoint) - - else: - self.retrying = False - logger.error('Frontier CAPI Auth: HTTP error or invalid JSON') - raise CredentialsError('HTTP error or invalid JSON') from e + logger.exception('Frontier CAPI: Misc. Error') + raise ServerError('Frontier CAPI: Misc. Error') from e except ValueError as e: logger.exception(f'decoding CAPI response content:\n{r.content.decode(encoding="utf-8")}\n') From 0637873b9128ab027fd15fa08638d1c6f3835162 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 14:54:01 +0100 Subject: [PATCH 071/527] CAPI: query error - Change JSON decode error message --- companion.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/companion.py b/companion.py index b1f76ae8..aacb0735 100644 --- a/companion.py +++ b/companion.py @@ -781,8 +781,7 @@ class Session(object): except ValueError as e: logger.exception(f'decoding CAPI response content:\n{r.content.decode(encoding="utf-8")}\n') - # TODO: What now ? - raise ServerError("Couldn't JSON decode CAPI response") from e + raise ServerError("Frontier CAPI response: couldn't decode JSON") from e except Exception as e: logger.debug('Attempting GET', exc_info=e) From 885745197c1330da570ff5917420b821ec5cf7ef Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 15:00:16 +0100 Subject: [PATCH 072/527] CAPI: EDMarketConnector: Set status text on ServerConnectionError --- EDMarketConnector.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 6fef5579..67d9064d 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1105,6 +1105,9 @@ class AppWindow(object): # TODO: Set status text return + except companion.ServerConnectionError: + self.status['text'] = _('Frontier CAPI server error') + except companion.CredentialsError: # Redirected back to Auth server - force full re-authentication companion.session.invalidate() From 6c24d9291ae0d7c06ffc89edf29590c65b4d5a1e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 15:13:33 +0100 Subject: [PATCH 073/527] CAPI: EDMarketConnector: Don't Session.invalidate() on CredentialsError --- EDMarketConnector.py | 2 -- companion.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 67d9064d..c2d3621d 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1109,8 +1109,6 @@ class AppWindow(object): self.status['text'] = _('Frontier CAPI server error') except companion.CredentialsError: - # Redirected back to Auth server - force full re-authentication - companion.session.invalidate() companion.session.retrying = False companion.session.login() diff --git a/companion.py b/companion.py index aacb0735..41640ca5 100644 --- a/companion.py +++ b/companion.py @@ -788,11 +788,13 @@ class Session(object): # LANG: Frontier CAPI data retrieval failed raise ServerError(f'{_("Frontier CAPI query failure")}: {capi_endpoint}') from e + # TODO: I don't think this happens any more, it's just a 401 status as above if r.url.startswith(FRONTIER_AUTH_SERVER): logger.info('Redirected back to Auth Server') self.dump(r) raise CredentialsError('Redirected back to Auth Server') + # TODO: Shouldn't this be covered by raise_for_status() above ? elif 500 <= r.status_code < 600: # Server error. Typically 500 "Internal Server Error" if server is down logger.debug('500 status back from CAPI') From 2179936d6f9154bdc1c599b5fd685c8d6f195ef4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 15:14:52 +0100 Subject: [PATCH 074/527] CAPI: No need to handle HTTP 5xx specially This will be handled by the `except HTTPError` above. --- companion.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/companion.py b/companion.py index 41640ca5..bb1af88a 100644 --- a/companion.py +++ b/companion.py @@ -794,14 +794,6 @@ class Session(object): self.dump(r) raise CredentialsError('Redirected back to Auth Server') - # TODO: Shouldn't this be covered by raise_for_status() above ? - elif 500 <= r.status_code < 600: - # Server error. Typically 500 "Internal Server Error" if server is down - logger.debug('500 status back from CAPI') - self.dump(r) - # LANG: Frontier CAPI data retrieval failed with 5XX code - raise ServerError(f'{_("Frontier CAPI server error")}: {r.status_code}') - self.retrying = False if capi_endpoint == self.FRONTIER_CAPI_PATH_PROFILE and 'commander' not in capi_data: From cd6d22844b4e7a2aeb758a0dacf764101782d8bc Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 15:15:36 +0100 Subject: [PATCH 075/527] CAPI: 'Need auth' is from 401 now, not a redirect --- companion.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/companion.py b/companion.py index bb1af88a..523ff89d 100644 --- a/companion.py +++ b/companion.py @@ -734,7 +734,7 @@ class Session(object): """Worker thread that performs actual CAPI queries.""" logger.debug('CAPI worker thread starting') - def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 + def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: """ Perform a *single* CAPI endpoint query within the thread worker. @@ -788,12 +788,6 @@ class Session(object): # LANG: Frontier CAPI data retrieval failed raise ServerError(f'{_("Frontier CAPI query failure")}: {capi_endpoint}') from e - # TODO: I don't think this happens any more, it's just a 401 status as above - if r.url.startswith(FRONTIER_AUTH_SERVER): - logger.info('Redirected back to Auth Server') - self.dump(r) - raise CredentialsError('Redirected back to Auth Server') - self.retrying = False if capi_endpoint == self.FRONTIER_CAPI_PATH_PROFILE and 'commander' not in capi_data: From ef32eb01402f8323aba6ab9234bfae34545b4951 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 15:16:42 +0100 Subject: [PATCH 076/527] CAPI: Remove un-needed check/setting of Session.retrying --- companion.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/companion.py b/companion.py index 523ff89d..4950b74e 100644 --- a/companion.py +++ b/companion.py @@ -770,12 +770,6 @@ class Session(object): # TODO: Translation ? raise ServerError("Frontier CAPI down for maintenance") from e - # TODO: Let caller decide on this - # if self.retrying: # Refresh just succeeded but this query failed! Force full re-authentication - # self.retrying = False - # raise CredentialsError('query failed after refresh') from e - - # TODO: Better to return error and have upstream re-try auth ? logger.exception('Frontier CAPI: Misc. Error') raise ServerError('Frontier CAPI: Misc. Error') from e @@ -788,8 +782,6 @@ class Session(object): # LANG: Frontier CAPI data retrieval failed raise ServerError(f'{_("Frontier CAPI query failure")}: {capi_endpoint}') from e - self.retrying = False - if capi_endpoint == self.FRONTIER_CAPI_PATH_PROFILE and 'commander' not in capi_data: logger.error('No commander in returned data') From 206367505c4ea0e12989b146e67d50589929af08 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 26 Aug 2021 15:31:39 +0100 Subject: [PATCH 077/527] CAPI: Cleanup some (un)needed translations --- companion.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/companion.py b/companion.py index 4950b74e..f69ae122 100644 --- a/companion.py +++ b/companion.py @@ -763,12 +763,13 @@ class Session(object): self.dump(r) if r.status_code == 401: # CAPI doesn't think we're Auth'd - # TODO: Translation ? + # No need for translation, we'll go straight into trying new Auth + # and thus any message would be overwritten. raise CredentialsError('Frontier CAPI said Auth required') from e if r.status_code == 418: # "I'm a teapot" - used to signal maintenance - # TODO: Translation ? - raise ServerError("Frontier CAPI down for maintenance") from e + # LANG: Frontier CAPI returned 418, meaning down for maintenance + raise ServerError(_("Frontier CAPI down for maintenance")) from e logger.exception('Frontier CAPI: Misc. Error') raise ServerError('Frontier CAPI: Misc. Error') from e @@ -790,8 +791,6 @@ class Session(object): '%Y-%m-%dT%H:%M:%SZ', parsedate(r.headers['Date']) # type: ignore ) - # TODO: Store a copy of this if it was /profile, e.g. for use by - # stats.py return capi_data def capi_station_queries(timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 From 12b1e9b7bc2782042968859e01bb59b16232da25 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 13:58:46 +0100 Subject: [PATCH 078/527] CAPI: Add more trace_if('capi.worker', ...) to check timings I keep observing it take 3-4s to update the UI after a manual CAPI request. This showed up as mostly *in* AppWindow.capi_handle_response(), but the moment I ran it under PyCharm profile that went down to 400ms. --- EDMarketConnector.py | 5 +++++ companion.py | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index c2d3621d..425550ce 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -900,6 +900,7 @@ class AppWindow(object): :param event: Tk generated event details. """ + logger.trace_if('capi.worker', 'Begin') auto_update = not event play_sound = (auto_update or int(event.type) == self.EVENT_VIRTUAL) and not config.get_int('hotkey_mute') @@ -937,6 +938,7 @@ class AppWindow(object): query_time = int(time()) logger.trace_if('capi.worker', 'Requesting full station data') config.set('querytime', query_time) + logger.trace_if('capi.worker', 'Calling companion.session.station') companion.session.station( query_time=query_time, tk_response_event=self._CAPI_RESPONSE_TK_EVENT_NAME, play_sound=play_sound @@ -944,6 +946,7 @@ class AppWindow(object): def capi_handle_response(self, event=None): # noqa: C901, CCR001 """Handle the resulting data from a CAPI query.""" + logger.trace_if('capi.worker', 'Handling response') play_bad: bool = False err: Optional[str] = None @@ -1151,9 +1154,11 @@ class AppWindow(object): # Update Odyssey Suit data companion.session.suit_update(capi_response.capi_data) + logger.trace_if('capi.worker', 'Updating suit and cooldown...') self.update_suit_text() self.suit_show_if_set() self.cooldown() + logger.trace_if('capi.worker', '...done') def journal_event(self, event): # noqa: C901, CCR001 # Currently not easily broken up. """ diff --git a/companion.py b/companion.py index f69ae122..11ee0a5b 100644 --- a/companion.py +++ b/companion.py @@ -734,7 +734,7 @@ class Session(object): """Worker thread that performs actual CAPI queries.""" logger.debug('CAPI worker thread starting') - def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: + def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 """ Perform a *single* CAPI endpoint query within the thread worker. @@ -744,7 +744,9 @@ class Session(object): """ capi_data: CAPIData try: + logger.trace_if('capi.worker', 'Sending HTTP request...') r = self.session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore + logger.trace_if('capi.worker', '... got result...') r.raise_for_status() # Typically 403 "Forbidden" on token expiry # May also fail here if token expired since response is empty capi_json = r.json() @@ -871,6 +873,7 @@ class Session(object): while True: query = self.capi_request_queue.get() + logger.trace_if('capi.worker', 'De-queued request') if not isinstance(query, EDMCCAPIRequest): logger.error("Item from queue wasn't an EDMCCAPIRequest") break @@ -934,6 +937,7 @@ class Session(object): # If the query came from EDMC.(py|exe) there's no tk to send an # event too, so assume it will be polling there response queue. if query.tk_response_event is not None: + logger.trace_if('capi.worker', 'Sending <>') self.tk_master.event_generate('<>') logger.info('CAPI worker thread DONE') @@ -1024,6 +1028,7 @@ class Session(object): :param auto_update: Whether this request was triggered automatically. """ # Ask the thread worker to perform all three queries + logger.trace_if('capi.worker', 'Enqueueing request') self.capi_request_queue.put( EDMCCAPIRequest( endpoint=self._CAPI_PATH_STATION, From bc29891cc12fbfb82737f1b764162df510ff7edd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 14:14:56 +0100 Subject: [PATCH 079/527] CAPI: Some notes in comments --- EDMarketConnector.py | 1 + companion.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 425550ce..aa6ed380 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1113,6 +1113,7 @@ class AppWindow(object): except companion.CredentialsError: companion.session.retrying = False + # TODO: Might need to .invalidate() here to avoid "already auth'd" companion.session.login() # Companion API problem diff --git a/companion.py b/companion.py index 11ee0a5b..c2770ca0 100644 --- a/companion.py +++ b/companion.py @@ -749,6 +749,8 @@ class Session(object): logger.trace_if('capi.worker', '... got result...') r.raise_for_status() # Typically 403 "Forbidden" on token expiry # May also fail here if token expired since response is empty + # r.status_code = 401 + # raise requests.HTTPError capi_json = r.json() capi_data = CAPIData(capi_json, capi_endpoint) self.capi_raw_data.record_endpoint( From 6968cd6c69cc72e6b692c744fef47adfa7d28c6b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 14:18:49 +0100 Subject: [PATCH 080/527] companion: Rename Auth.session to requests_session So as to not confuse with companion.session. --- Contributing.md | 4 ++-- companion.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Contributing.md b/Contributing.md index c74953a1..bdbf4634 100644 --- a/Contributing.md +++ b/Contributing.md @@ -247,10 +247,10 @@ from edmc_data import DEBUG_WEBSERVER_HOST, DEBUG_WEBSERVER_PORT TARGET_URL = 'https://www.edsm.net/api-journal-v1' if 'edsm' in debug_senders: - TARGET_URL = f'http://{DEBUG_WEBSERVER_HOST}:{DEBUG_WEBSERVER_PORT}/edsm' + TARGET_URL = f'http://{DEBUG_WEBSERVER_HOST}:{DEBUG_WEBSERVER_PORT}/edsm' ... - r = this.session.post(TARGET_URL, data=data, timeout=_TIMEOUT) +r = this.requests_session.post(TARGET_URL, data=data, timeout=_TIMEOUT) ``` Be sure to set a URL path in the `TARGET_URL` that denotes where the data diff --git a/companion.py b/companion.py index c2770ca0..bb5d3605 100644 --- a/companion.py +++ b/companion.py @@ -295,15 +295,15 @@ class Auth(object): def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr - self.session = requests.Session() - self.session.headers['User-Agent'] = USER_AGENT + self.requests_session = requests.Session() + self.requests_session.headers['User-Agent'] = USER_AGENT self.verifier: Union[bytes, None] = None self.state: Union[str, None] = None def __del__(self) -> None: """Ensure our Session is closed if we're being deleted.""" - if self.session: - self.session.close() + if self.requests_session: + self.requests_session.close() def refresh(self) -> Optional[str]: """ @@ -334,7 +334,7 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: - r = self.session.post( + r = self.requests_session.post( FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=data, timeout=auth_timeout @@ -422,7 +422,7 @@ class Auth(object): # requests_log.setLevel(logging.DEBUG) # requests_log.propagate = True - r = self.session.post( + r = self.requests_session.post( FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=request_data, timeout=auth_timeout @@ -430,7 +430,7 @@ class Auth(object): data_token = r.json() if r.status_code == requests.codes.ok: # Now we need to /decode the token to check the customer_id against FID - r = self.session.get( + r = self.requests_session.get( FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_DECODE, headers={ 'Authorization': f'Bearer {data_token.get("access_token", "")}', From 74170da4347c191f393828e5502ac4ab2558b9bb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 14:24:15 +0100 Subject: [PATCH 081/527] companion: Rename Session.session to requests_session So as to avoid confusion with companion.session --- companion.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/companion.py b/companion.py index bb5d3605..3288cd74 100644 --- a/companion.py +++ b/companion.py @@ -598,7 +598,7 @@ class Session(object): self.state = Session.STATE_INIT self.server: Optional[str] = None self.credentials: Optional[Dict[str, Any]] = None - self.session: Optional[requests.Session] = None + self.requests_session: Optional[requests.Session] = None self.auth: Optional[Auth] = None self.retrying = False # Avoid infinite loop when successful auth / unsuccessful query self.tk_master: Optional[tk.Tk] = None @@ -631,9 +631,9 @@ class Session(object): def start_frontier_auth(self, access_token: str) -> None: """Start an oAuth2 session.""" logger.debug('Starting session') - self.session = requests.Session() - self.session.headers['Authorization'] = f'Bearer {access_token}' - self.session.headers['User-Agent'] = USER_AGENT + self.requests_session = requests.Session() + self.requests_session.headers['Authorization'] = f'Bearer {access_token}' + self.requests_session.headers['User-Agent'] = USER_AGENT self.state = Session.STATE_OK def login(self, cmdr: str = None, is_beta: Optional[bool] = None) -> bool: @@ -710,14 +710,14 @@ class Session(object): def close(self) -> None: """Close Frontier authorization session.""" self.state = Session.STATE_INIT - if self.session: + if self.requests_session: try: - self.session.close() + self.requests_session.close() except Exception as e: logger.debug('Frontier Auth: closing', exc_info=e) - self.session = None + self.requests_session = None def invalidate(self) -> None: """Invalidate Frontier authorization credentials.""" @@ -745,7 +745,7 @@ class Session(object): capi_data: CAPIData try: logger.trace_if('capi.worker', 'Sending HTTP request...') - r = self.session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore + r = self.requests_session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore logger.trace_if('capi.worker', '... got result...') r.raise_for_status() # Typically 403 "Forbidden" on token expiry # May also fail here if token expired since response is empty From 024e2ba35768e7e5fb524c269bc209ef2d4a54bd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 14:24:54 +0100 Subject: [PATCH 082/527] EDMarketConnector: invalidate companion session and return on CredentialsError * If we don't invalidate then the companion.Auth code will do nothing due to "already auth'd". * We need to give the auth flow time to complete, so need to return. * As that auth flow can take indeterminate time, not setting a timed retry of the CAPI query here. We should consider setting a flag and reacting in the Auth code though. --- EDMarketConnector.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index aa6ed380..9b02e912 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1114,7 +1114,9 @@ class AppWindow(object): except companion.CredentialsError: companion.session.retrying = False # TODO: Might need to .invalidate() here to avoid "already auth'd" + companion.session.invalidate() companion.session.login() + return # Companion API problem except companion.ServerLagging as e: From e3cd1d642993564e9a65fc2465830ee3954fb934 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 14:27:20 +0100 Subject: [PATCH 083/527] EDMarketConnector: Comment about no timed CAPI retry on re-Auth --- EDMarketConnector.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 9b02e912..d416c1b2 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1113,10 +1113,9 @@ class AppWindow(object): except companion.CredentialsError: companion.session.retrying = False - # TODO: Might need to .invalidate() here to avoid "already auth'd" companion.session.invalidate() companion.session.login() - return + return # We need to give Auth time to complete, so can't set a timed retry # Companion API problem except companion.ServerLagging as e: From 67220fc96a592d68bad5042494f1da5607849a83 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 14:35:22 +0100 Subject: [PATCH 084/527] CAPI: Change CAPIDataRaw.__getitem__ to using __getitem__ itself The only use of this is stats.py, and it explicitly checks for the key's existence first. --- companion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion.py b/companion.py index 3288cd74..f6301d07 100644 --- a/companion.py +++ b/companion.py @@ -173,7 +173,7 @@ class CAPIDataRaw: def __getitem__(self, item): """Make the raw_data dict's items get'able.""" - return self.raw_data.get(item) + return self.raw_data.__getitem__(item) def listify(thing: Union[List, Dict]) -> List: From 9e206d092cbc0e0006819f67edfc7e59645cfdf5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 14:36:54 +0100 Subject: [PATCH 085/527] Fix "" string to be '' --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index d416c1b2..9c113b1f 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -964,7 +964,7 @@ class AppWindow(object): logger.trace_if('capi.worker', 'Answer is not a Failure') if not isinstance(capi_response, companion.EDMCCAPIResponse): - msg = f"Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}" + msg = f'Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}' logger.error(msg) raise ValueError(msg) From 50db6c528ada4ae94372acd7b46e59b2ed1b8ae0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 28 Aug 2021 15:34:41 +0100 Subject: [PATCH 086/527] EDMC: Attempt to handle CAPI exceptions as per EDMarketConnector.py * Moved most of the exception handling/message output down to the outermost try's except clauses. --- EDMC.py | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/EDMC.py b/EDMC.py index ab65d726..6c7163d7 100755 --- a/EDMC.py +++ b/EDMC.py @@ -271,6 +271,7 @@ sys.path: {sys.path}''' companion.session.login(monitor.cmdr, monitor.is_beta) + ################################################################### # Initiate CAPI queries querytime = int(time()) companion.session.station(query_time=querytime) @@ -286,6 +287,8 @@ sys.path: {sys.path}''' logger.error(f'CAPI requests timed out after {_capi_request_timeout} seconds') sys.exit(EXIT_SERVER) + ################################################################### + # noinspection DuplicatedCode if isinstance(capi_response, companion.EDMCCAPIFailedRequest): logger.trace_if('capi.worker', f'Failed Request: {capi_response.message}') @@ -297,9 +300,7 @@ sys.path: {sys.path}''' logger.trace_if('capi.worker', 'Answer is not a Failure') if not isinstance(capi_response, companion.EDMCCAPIResponse): - msg = f"Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}" - logger.error(msg) - raise ValueError(msg) + raise ValueError(f"Response was neither CAPIFailedRequest nor EDMCAPIResponse: {type(capi_response)}") data = capi_response.capi_data config.set('querytime', querytime) @@ -309,10 +310,10 @@ sys.path: {sys.path}''' logger.error("No data['command']['name'] from CAPI") sys.exit(EXIT_SERVER) - elif not deep_get(data, 'lastSystem', 'name') or \ - data['commander'].get('docked') and not \ - deep_get(data, 'lastStarport', 'name'): # Only care if docked - + elif ( + not deep_get(data, 'lastSystem', 'name') or + data['commander'].get('docked') and not deep_get(data, 'lastStarport', 'name') + ): # Only care if docked logger.error("No data['lastSystem']['name'] from CAPI") sys.exit(EXIT_SERVER) @@ -324,16 +325,15 @@ sys.path: {sys.path}''' pass # Skip further validation elif data['commander']['name'] != monitor.cmdr: - logger.error(f'Commander "{data["commander"]["name"]}" from CAPI doesn\'t match "{monitor.cmdr}" from Journal') # noqa: E501 - sys.exit(EXIT_CREDENTIALS) + raise companion.CmdrError() - elif data['lastSystem']['name'] != monitor.system or \ - ((data['commander']['docked'] and data['lastStarport']['name'] or None) != monitor.station) or \ - data['ship']['id'] != monitor.state['ShipID'] or \ - data['ship']['name'].lower() != monitor.state['ShipType']: - - logger.error('Mismatch(es) between CAPI and Journal for at least one of: StarSystem, Last Star Port, Ship ID or Ship Name/Type') # noqa: E501 - sys.exit(EXIT_LAGGING) + elif ( + data['lastSystem']['name'] != monitor.system or + ((data['commander']['docked'] and data['lastStarport']['name'] or None) != monitor.station) or + data['ship']['id'] != monitor.state['ShipID'] or + data['ship']['name'].lower() != monitor.state['ShipType'] + ): + raise companion.ServerLagging() # stuff we can do when not docked if args.d: @@ -446,13 +446,36 @@ sys.path: {sys.path}''' logger.exception('Failed to send data to EDDN') except companion.ServerError: - logger.error('Frontier CAPI Server returned an error') + logger.exception('Frontier CAPI Server returned an error') + sys.exit(EXIT_SERVER) + + except companion.ServerConnectionError: + logger.exception('Exception while contacting server') sys.exit(EXIT_SERVER) except companion.CredentialsError: logger.error('Frontier CAPI Server: Invalid Credentials') sys.exit(EXIT_CREDENTIALS) + # Companion API problem + except companion.ServerLagging: + logger.error( + 'Mismatch(es) between CAPI and Journal for at least one of: ' + 'StarSystem, Last Star Port, Ship ID or Ship Name/Type' + ) + sys.exit(EXIT_SERVER) + + except companion.CmdrError: # Companion API return doesn't match Journal + logger.error( + f'Commander "{data["commander"]["name"]}" from CAPI doesn\'t match ' + f'"{monitor.cmdr}" from Journal' + ) + sys.exit(EXIT_SERVER) + + except Exception: + logger.exception('"other" exception') + sys.exit(EXIT_SERVER) + if __name__ == '__main__': main() From d1dbd9da8f790293ba02ac83224973fc7568161d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 30 Aug 2021 12:55:45 +0100 Subject: [PATCH 087/527] AppWindow.capi_request_data: Specific "We're aborting query" messages --- EDMarketConnector.py | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 9c113b1f..d0559345 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -904,14 +904,35 @@ class AppWindow(object): auto_update = not event play_sound = (auto_update or int(event.type) == self.EVENT_VIRTUAL) and not config.get_int('hotkey_mute') - if ( - not monitor.cmdr or not monitor.mode or monitor.state['Captain'] - or not monitor.system or monitor.mode == 'CQC' - ): - logger.trace_if('capi.worker', 'CQC detected, aborting query') + if not monitor.cmdr: + logger.trace_if('capi.worker', 'Aborting Query: Cmdr unknown') + # LANG: CAPI queries aborted because Cmdr name is unknown + self.status['text'] = _('CAPI query aborted: Cmdr name unknown') + return + + if not monitor.mode: + logger.trace_if('capi.worker', 'Aborting Query: Game Mode unknown') + # LANG: CAPI queries aborted because game mode unknown + self.status['text'] = _('CAPI query aborted: Game mode unknown') + return + + if not monitor.system: + logger.trace_if('capi.worker', 'Aborting Query: Current star system unknown') + # LANG: CAPI queries aborted because current star system name unknown + self.status['text'] = _('CAPI query aborted: Current system unknown') + return + + if monitor.state['Captain']: + logger.trace_if('capi.worker', 'Aborting Query: In multi-crew') + # LANG: CAPI queries aborted because player is in multi-crew on other Cmdr's ship + self.status['text'] = _('CAPI query aborted: In other-ship multi-crew') + return + + if monitor.mode == 'CQC': + logger.trace_if('capi.worker', 'Aborting Query: In CQC') # LANG: CAPI queries aborted because player is in CQC (Arena) - self.status['text'] = _('CQC detected, aborting CAPI query') - return # In CQC or on crew - do nothing + self.status['text'] = _('CAPI query aborted: CQC (Arena) detected') + return if companion.session.state == companion.Session.STATE_AUTH: logger.trace_if('capi.worker', 'Auth in progress? Aborting query') From fd3ebc9c21e98717fb519e7c5ddff11b6800fd2d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 10:49:04 +0100 Subject: [PATCH 088/527] Python version: 3.9.7 --- .github/workflows/windows-build.yml | 2 +- .python-version | 2 +- ChangeLog.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index e1041864..eac27cf4 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.3.4 - uses: actions/setup-python@v2.2.2 with: - python-version: "3.9.6" + python-version: "3.9.7" architecture: "x86" - name: Install python tools diff --git a/.python-version b/.python-version index 1635d0f5..f69abe41 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.6 +3.9.7 diff --git a/ChangeLog.md b/ChangeLog.md index e8031212..2eb45d0b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.9.6. +* We now test against, and package with, Python 3.9.7. **As a consequence of this we no longer support Windows 7. This is due to From 092b10447c9f2c8fe280200de8f0c63a1d273529 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 12:09:02 +0100 Subject: [PATCH 089/527] EDMarketConnector.py: Early return from AppWindow.save_raw() --- EDMarketConnector.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index d0559345..53260e6f 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1611,9 +1611,11 @@ class AppWindow(object): initialdir=config.get_str('outdir'), initialfile=f'{monitor.system}{monitor.station}.{timestamp}' ) - if f: - with open(f, 'wb') as h: - h.write(str(companion.session.capi_raw_data).encode(encoding='utf-8')) + if not f: + return + + with open(f, 'wb') as h: + h.write(str(companion.session.capi_raw_data).encode(encoding='utf-8')) # def exit_tray(self, systray: 'SysTrayIcon') -> None: # """Tray icon is shutting down.""" From 613a992ae9a4d006d2b6f907e80660b556d7d738 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 12:09:40 +0100 Subject: [PATCH 090/527] companion: Change comments on CAPI cooldown/timeouts --- companion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index f6301d07..8524b510 100644 --- a/companion.py +++ b/companion.py @@ -48,8 +48,8 @@ else: # Define custom type for the dicts that hold CAPI data # CAPIData = NewType('CAPIData', Dict) -capi_query_cooldown = 60 # be nice -capi_default_timeout = 10 # requests timeout +capi_query_cooldown = 60 # Minimum time between (sets of) CAPI queries +capi_default_timeout = 10 auth_timeout = 30 # timeout for initial auth # Used by both class Auth and Session From bf33f88260f010e56ba971ccbef639e971488404 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 12:10:59 +0100 Subject: [PATCH 091/527] companion: Rename to capi_default_requests_timeout So it doesn't even need a comment. --- companion.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/companion.py b/companion.py index 8524b510..3fc4c817 100644 --- a/companion.py +++ b/companion.py @@ -49,7 +49,7 @@ else: # CAPIData = NewType('CAPIData', Dict) capi_query_cooldown = 60 # Minimum time between (sets of) CAPI queries -capi_default_timeout = 10 +capi_default_requests_timeout = 10 auth_timeout = 30 # timeout for initial auth # Used by both class Auth and Session @@ -734,7 +734,9 @@ class Session(object): """Worker thread that performs actual CAPI queries.""" logger.debug('CAPI worker thread starting') - def capi_single_query(capi_endpoint: str, timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 + def capi_single_query( # noqa: CCR001 + capi_endpoint: str, timeout: int = capi_default_requests_timeout + ) -> CAPIData: """ Perform a *single* CAPI endpoint query within the thread worker. @@ -797,7 +799,7 @@ class Session(object): return capi_data - def capi_station_queries(timeout: int = capi_default_timeout) -> CAPIData: # noqa: CCR001 + def capi_station_queries(timeout: int = capi_default_requests_timeout) -> CAPIData: # noqa: CCR001 """ Perform all 'station' queries for the caller. From af50a9f59d074a9a584560c680c24f93c9f426f6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 12:44:46 +0100 Subject: [PATCH 092/527] companion: Make raw_data.__str__() a little less verbose NB: We can't use a generator here to make a python object of the data, to then use json.dumps() on because the raw_data is a *string* (decoded from what we received from the CAPI service), and thus it will get encoded as such, i.e. "raw_data": "{\"id\":322... when we want: "raw_data": {"id":322... We do not want to json.loads() that string only to then json.dumps() it because the whole point is that this is the **raw** data to help diagnose any issues with the CAPI service/data. Such a conversion and back could either throw an exception we don't want here (because we want the raw data) or possibly distort things from what was actually received. --- companion.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/companion.py b/companion.py index 3fc4c817..1d7f1b89 100644 --- a/companion.py +++ b/companion.py @@ -158,9 +158,9 @@ class CAPIDataRaw: def __str__(self): """Return a more readable string form of the data.""" capi_data_str = '{' - for e in self.raw_data.keys(): - capi_data_str += f'"{e}":\n{{\n\t"query_time": "{self.raw_data[e].query_time}",\n\t' \ - f'"raw_data": {self.raw_data[e].raw_data}\n}},\n\n' + for k, v in self.raw_data.items(): + capi_data_str += f'"{k}":\n{{\n\t"query_time": "{v.query_time}",\n\t' \ + f'"raw_data": {v.raw_data}\n}},\n\n' capi_data_str = capi_data_str.removesuffix(',\n\n') capi_data_str += '\n\n}' From 60379892eef125dfad70570474e1106771503244 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 13:07:00 +0100 Subject: [PATCH 093/527] companion: DRY try/except of CAPI queries --- companion.py | 60 +++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 41 deletions(-) diff --git a/companion.py b/companion.py index 1d7f1b89..957b7ee1 100644 --- a/companion.py +++ b/companion.py @@ -888,55 +888,33 @@ class Session(object): logger.trace_if('capi.worker', f'Processing query: {query.endpoint}') capi_data: CAPIData - if query.endpoint == self._CAPI_PATH_STATION: - try: + try: + if query.endpoint == self._CAPI_PATH_STATION: capi_data = capi_station_queries() - except Exception as e: - self.capi_response_queue.put( - EDMCCAPIFailedRequest( - message=str(e.args), - exception=e, - query_time=query.query_time, - play_sound=query.play_sound, - auto_update=query.auto_update - ) - ) - else: - self.capi_response_queue.put( - EDMCCAPIResponse( - capi_data=capi_data, - query_time=query.query_time, - play_sound=query.play_sound, - auto_update=query.auto_update - ) - ) - - else: - try: capi_data = capi_single_query(self.FRONTIER_CAPI_PATH_PROFILE) - except Exception as e: - self.capi_response_queue.put( - EDMCCAPIFailedRequest( - message=e.args, - exception=e, - query_time=query.query_time, - play_sound=query.play_sound, - auto_update=query.auto_update - ) + except Exception as e: + self.capi_response_queue.put( + EDMCCAPIFailedRequest( + message=str(e.args), + exception=e, + query_time=query.query_time, + play_sound=query.play_sound, + auto_update=query.auto_update ) + ) - else: - self.capi_response_queue.put( - EDMCCAPIResponse( - capi_data=capi_data, - query_time=query.query_time, - play_sound=query.play_sound, - auto_update=query.auto_update - ) + else: + self.capi_response_queue.put( + EDMCCAPIResponse( + capi_data=capi_data, + query_time=query.query_time, + play_sound=query.play_sound, + auto_update=query.auto_update ) + ) # If the query came from EDMC.(py|exe) there's no tk to send an # event too, so assume it will be polling there response queue. From 796bb1f8639c00c2ab9fa29375f0acb0b4842cb5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 14:06:56 +0100 Subject: [PATCH 094/527] CAPI: Remove unuses Session.query/profile() * Session.profile() was unused (used to be called from stats.py, but that uses cached data now). * Session.query() was unused, other than by itself. Normal calls will currently be via companion.Session.station(). Future CAPI queries like `/fleetcarrier` might add their own companion.Session function. * And in doing so get --capi-pretend-down working again. * Small tweak to EDMarketConnector to not throw extra exception if there was a CAPI query exception. --- EDMarketConnector.py | 5 ++-- companion.py | 67 ++------------------------------------------ 2 files changed, 5 insertions(+), 67 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 53260e6f..77b07bfe 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1106,6 +1106,8 @@ class AppWindow(object): self.suit['text'] = f'{suitname} ({loadout_name})' self.suit_show_if_set() + # Update Odyssey Suit data + companion.session.suit_update(capi_response.capi_data) if capi_response.capi_data['commander'].get('credits') is not None: monitor.state['Credits'] = capi_response.capi_data['commander']['credits'] @@ -1174,9 +1176,6 @@ class AppWindow(object): if capi_response.play_sound and play_bad: hotkeymgr.play_bad() - # Update Odyssey Suit data - companion.session.suit_update(capi_response.capi_data) - logger.trace_if('capi.worker', 'Updating suit and cooldown...') self.update_suit_text() self.suit_show_if_set() diff --git a/companion.py b/companion.py index 957b7ee1..e61b39a7 100644 --- a/companion.py +++ b/companion.py @@ -747,6 +747,9 @@ class Session(object): capi_data: CAPIData try: logger.trace_if('capi.worker', 'Sending HTTP request...') + if conf_module.capi_pretend_down: + raise ServerConnectionError(f'Pretending CAPI down: {capi_endpoint}') + r = self.requests_session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore logger.trace_if('capi.worker', '... got result...') r.raise_for_status() # Typically 403 "Forbidden" on token expiry @@ -933,70 +936,6 @@ class Session(object): ) ) - def query( - self, endpoint: str, query_time: int, - tk_response_event: Optional[str] = None, - play_sound: bool = False, auto_update: bool = False - ) -> None: - """ - Perform a query against the specified CAPI endpoint. - - :param endpoint: The CAPI endpoint to query. - :param tk_response_event: Name of tk event to generate when response queued. - :param query_time: When this query was initiated. - :param play_sound: Whether the app should play a sound on error. - :param auto_update: Whether this request was triggered automatically. - """ - logger.trace_if('capi.query', f'Performing query for endpoint "{endpoint}"') - if self.state == Session.STATE_INIT: - if self.login(): - self.query( - endpoint, query_time, tk_response_event=tk_response_event, play_sound=play_sound, - auto_update=auto_update - ) - return - - elif self.state == Session.STATE_AUTH: - logger.error('cannot make a query when unauthorized') - raise CredentialsError('cannot make a query when unauthorized') - - logger.trace_if('capi.query', 'Trying...') - if conf_module.capi_pretend_down: - raise ServerConnectionError(f'Pretending CAPI down: {endpoint}') - - self.capi_request_queue.put( - EDMCCAPIRequest( - endpoint=endpoint, - tk_response_event=tk_response_event, - query_time=query_time, - play_sound=play_sound, - auto_update=auto_update - ) - ) - - def profile( - self, - query_time: int = 0, - tk_response_event: Optional[str] = None, - play_sound: bool = False, auto_update: bool = False - ) -> None: - """ - Perform general CAPI /profile endpoint query. - - :param query_time: When this query was initiated. - :param tk_response_event: Name of tk event to generate when response queued. - :param play_sound: Whether the app should play a sound on error. - :param auto_update: Whether this request was triggered automatically. - """ - if query_time == 0: - query_time = int(time.time()) - - self.query( - self.FRONTIER_CAPI_PATH_PROFILE, query_time=query_time, - tk_response_event=tk_response_event, - play_sound=play_sound, auto_update=auto_update - ) - def station( self, query_time: int, tk_response_event: Optional[str] = None, play_sound: bool = False, auto_update: bool = False From 018ee49a0db7b3e4bd3e925538f92c5650739a6b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 31 Aug 2021 15:03:41 +0100 Subject: [PATCH 095/527] Fix logic for 'Update' button visual state wrt CQC This was wrong since 291fbf2908e0f7419769a7727ee0a79cf58a9342 due to the check saying "only active if in CQC", when it needed to be "only active NOT in CQC, along with these other conditions". --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 77b07bfe..45389fa4 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1468,7 +1468,7 @@ class AppWindow(object): self.button['text'] = self.theme_button['text'] = _('Update') # LANG: Update button in main window self.button['state'] = self.theme_button['state'] = (monitor.cmdr and monitor.mode and - monitor.mode == 'CQC' and + monitor.mode != 'CQC' and not monitor.state['Captain'] and monitor.system and tk.NORMAL or tk.DISABLED) From 589895922899911a8a080399b7ce3b19f5f63822 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Aug 2021 17:03:50 +0000 Subject: [PATCH 096/527] build(deps-dev): bump pytest from 6.2.4 to 6.2.5 Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.4 to 6.2.5. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.4...6.2.5) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 7e692601..e358714b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -31,7 +31,7 @@ grip==4.5.2 py2exe==0.10.4.0; sys_platform == 'win32' # Testing -pytest==6.2.4 +pytest==6.2.5 pytest-cov==2.12.1 # Pytest code coverage support coverage[toml]==5.5 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. From 0e4e31d733b42a04f3c3608f96a18c5847fe693c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 2 Sep 2021 19:41:37 +0100 Subject: [PATCH 097/527] EDMarketConnector: Correct back to dashboard.start() Bad PyCharm refactor/rename in 81b5d015fdeecfcf2236a61c433d4c2dac929668 --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 45389fa4..911ebdd0 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1315,7 +1315,7 @@ class AppWindow(object): logger.info('Monitor: Disable WinSparkle automatic update checks') # Can't start dashboard monitoring - if not dashboard.start_frontier_auth(self.w, monitor.started): + if not dashboard.start(self.w, monitor.started): logger.info("Can't start Status monitoring") # Export loadout From 8180b34798f06e00871f331f1bf5162fa493f2cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 17:03:19 +0000 Subject: [PATCH 098/527] build(deps-dev): bump py2exe from 0.10.4.0 to 0.10.4.1 Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.10.4.0 to 0.10.4.1. - [Release notes](https://github.com/py2exe/py2exe/releases) - [Changelog](https://github.com/py2exe/py2exe/blob/master/ChangeLog) - [Commits](https://github.com/py2exe/py2exe/compare/v0.10.4.0...v0.10.4.1) --- updated-dependencies: - dependency-name: py2exe dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e358714b..14bc577f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -28,7 +28,7 @@ grip==4.5.2 # Packaging # We only need py2exe on windows. -py2exe==0.10.4.0; sys_platform == 'win32' +py2exe==0.10.4.1; sys_platform == 'win32' # Testing pytest==6.2.5 From 1b7eb30af16f9f6714b4782fd420b8ac1f237acd Mon Sep 17 00:00:00 2001 From: Forest Date: Fri, 17 Sep 2021 17:26:22 -0700 Subject: [PATCH 099/527] Log git's absence at the INFO level, not ERROR The ERROR log level is needlessly high for complaining about git not being installed, especially when we're running from an extracted source archive rather than a repo. Let's keep things calm and avoid polluting desktop session logs. The INFO log level is plenty. --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index e88f3275..a157e407 100644 --- a/config.py +++ b/config.py @@ -116,7 +116,7 @@ def git_shorthash_from_head() -> str: out, err = git_cmd.communicate() except Exception as e: - logger.error(f"Couldn't run git command for short hash: {e!r}") + logger.info(f"Couldn't run git command for short hash: {e!r}") else: shorthash = out.decode().rstrip('\n') From cbcf5f6d44d143faec2af8f8a4e4559de3dd05ad Mon Sep 17 00:00:00 2001 From: Forest Date: Fri, 17 Sep 2021 17:26:22 -0700 Subject: [PATCH 100/527] Log git's absence at the INFO level, not ERROR The ERROR log level is needlessly high for complaining about git not being installed, especially when we're running from an extracted source archive rather than a repo. Let's keep things calm and avoid polluting desktop session logs. The INFO log level is plenty. --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index d1cfd403..b1437047 100644 --- a/config.py +++ b/config.py @@ -117,7 +117,7 @@ def git_shorthash_from_head() -> str: out, err = git_cmd.communicate() except Exception as e: - logger.error(f"Couldn't run git command for short hash: {e!r}") + logger.info(f"Couldn't run git command for short hash: {e!r}") else: shorthash = out.decode().rstrip('\n') From 8c0ea8905888a8d0e4407de03b466c644f00175c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 17:03:29 +0000 Subject: [PATCH 101/527] build(deps-dev): bump types-requests from 2.25.6 to 2.25.8 Bumps [types-requests](https://github.com/python/typeshed) from 2.25.6 to 2.25.8. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e358714b..28e9dd68 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.1 mypy==0.910 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.25.6 +types-requests==2.25.8 # Code formatting tools autopep8==1.5.7 From e6e1cbd2215fafb3c6bb274c935df4e8ec9c7153 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 24 Sep 2021 10:34:42 +0100 Subject: [PATCH 102/527] CL args: Group them in-code --- EDMarketConnector.py | 48 +++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 911ebdd0..0797f814 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -70,6 +70,28 @@ if __name__ == '__main__': # noqa: C901 "such as EDSM, Inara.cz and EDDB." ) + ########################################################################### + # Permanent config changes + ########################################################################### + parser.add_argument( + '--reset-ui', + help='reset UI theme and transparency to defaults', + action='store_true' + ) + ########################################################################### + + ########################################################################### + # User 'utility' args + ########################################################################### + parser.add_argument('--suppress-dupe-process-popup', + help='Suppress the popup from when the application detects another instance already running', + action='store_true' + ) + ########################################################################### + + ########################################################################### + # Adjust logging + ########################################################################### parser.add_argument( '--trace', help='Set the Debug logging loglevel to TRACE', @@ -89,28 +111,21 @@ if __name__ == '__main__': # noqa: C901 ) parser.add_argument( - '--reset-ui', - help='reset UI theme and transparency to defaults', - action='store_true' + '--debug-sender', + help='Mark the selected sender as in debug mode. This generally results in data being written to disk', + action='append', ) + ########################################################################### + ########################################################################### + # Frontier Auth + ########################################################################### parser.add_argument( '--forget-frontier-auth', help='resets all authentication tokens', action='store_true' ) - parser.add_argument('--suppress-dupe-process-popup', - help='Suppress the popup from when the application detects another instance already running', - action='store_true' - ) - - parser.add_argument( - '--debug-sender', - help='Mark the selected sender as in debug mode. This generally results in data being written to disk', - action='append', - ) - auth_options = parser.add_mutually_exclusive_group(required=False) auth_options.add_argument('--force-localserver-for-auth', help='Force EDMC to use a localhost webserver for Frontier Auth callback', @@ -126,12 +141,17 @@ if __name__ == '__main__': # noqa: C901 help='Callback from Frontier Auth', nargs='*' ) + ########################################################################### + ########################################################################### + # Developer 'utility' args + ########################################################################### parser.add_argument( '--capi-pretend-down', help='Force to raise ServerError on any CAPI query', action='store_true' ) + ########################################################################### args = parser.parse_args() From f9875b5b9a597db3e64e868c9abcdaff783009ea Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 24 Sep 2021 10:59:15 +0100 Subject: [PATCH 103/527] EDDN: Make use of new CL arg to use custom upload URL This also entailed slightly reworking the way the EDDN code uses this URL. It was very generalised, so as to allow for the debug "just send and log locally" code, but as the only URL is the 'upload' one much of that seemed un-necessary. So that code has been simplified. --- EDMarketConnector.py | 8 ++++++++ config.py | 14 ++++++++++++++ plugins/eddn.py | 19 ++++++++++--------- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 0797f814..094a6015 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -151,6 +151,11 @@ if __name__ == '__main__': # noqa: C901 help='Force to raise ServerError on any CAPI query', action='store_true' ) + + parser.add_argument( + '--eddn-url', + help='Specify an alternate EDDN upload URL', + ) ########################################################################### args = parser.parse_args() @@ -176,6 +181,9 @@ if __name__ == '__main__': # noqa: C901 if args.force_localserver_for_auth: config.set_auth_force_localserver() + if args.eddn_url: + config.set_eddn_url(args.eddn_url) + if args.force_edmc_protocol: if sys.platform == 'win32': config.set_auth_force_edmc_protocol() diff --git a/config.py b/config.py index b1437047..7a51547a 100644 --- a/config.py +++ b/config.py @@ -207,6 +207,7 @@ class AbstractConfig(abc.ABC): __in_shutdown = False # Is the application currently shutting down ? __auth_force_localserver = False # Should we use localhost for auth callback ? __auth_force_edmc_protocol = False # Should we force edmc:// protocol ? + __eddn_url = None # Non-default EDDN URL def __init__(self) -> None: self.home_path = pathlib.Path.home() @@ -250,6 +251,19 @@ class AbstractConfig(abc.ABC): """ return self.__auth_force_edmc_protocol + def set_eddn_url(self, eddn_url: str): + """Set the specified eddn URL.""" + self.__eddn_url = eddn_url + + @property + def eddn_url(self) -> Optional[str]: + """ + Provide the custom EDDN URL. + + :return: str - Custom EDDN URL to use. + """ + return self.__eddn_url + @property def app_dir(self) -> str: """Return a string version of app_dir.""" diff --git a/plugins/eddn.py b/plugins/eddn.py index 36a4cb94..339baec0 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -88,14 +88,9 @@ HORIZ_SKU = 'ELITE_HORIZONS_V_PLANETARY_LANDINGS' class EDDN: """EDDN Data export.""" - DEBUG = 'eddn' in debug_senders - SERVER = 'https://eddn.edcd.io:4430' - if DEBUG: - SERVER = f'http://{edmc_data.DEBUG_WEBSERVER_HOST}:{edmc_data.DEBUG_WEBSERVER_PORT}' - - UPLOAD = f'{SERVER}/upload/' - if DEBUG: - UPLOAD = f'{SERVER}/eddn' + DEFAULT_URL = 'https://eddn.edcd.io:4430/upload' + if 'eddn' in debug_senders: + DEFAULT_URL = f'http://{edmc_data.DEBUG_WEBSERVER_HOST}:{edmc_data.DEBUG_WEBSERVER_PORT}/eddn' REPLAYPERIOD = 400 # Roughly two messages per second, accounting for send delays [ms] REPLAYFLUSH = 20 # Update log on disk roughly every 10 seconds @@ -109,6 +104,12 @@ class EDDN: self.replayfile: Optional[TextIO] = None # For delayed messages self.replaylog: List[str] = [] + if config.eddn_url is not None: + self.eddn_url = config.eddn_url + + else: + self.eddn_url = self.DEFAULT_URL + def load_journal_replay(self) -> bool: """ Load cached journal entries from disk. @@ -187,7 +188,7 @@ class EDDN: ('message', msg['message']), ]) - r = self.session.post(self.UPLOAD, data=json.dumps(to_send), timeout=self.TIMEOUT) + r = self.session.post(self.eddn_url, data=json.dumps(to_send), timeout=self.TIMEOUT) if r.status_code != requests.codes.ok: # Check if EDDN is still objecting to an empty commodities list From 5b68aad1846a9c23347e4a439eafe1ae84c90b0e Mon Sep 17 00:00:00 2001 From: A_D Date: Fri, 24 Sep 2021 16:39:30 +0200 Subject: [PATCH 104/527] Remove protocol.protocolhandler singleton auto-init In general, doing things like this on import is bad, but this was changed specifically to remove a bug that causes --force-localserver-auth to do nothing. That is caused because while we were careful not to import protocol until after we were done doing arg things, we did not check to make sure something else didn't. Companion imports protocol, which thus always instantiates WindowsProtocolHandler before we can modify some config state to indicate that we want LinuxProtocolHandler. --- EDMarketConnector.py | 9 ++++++--- companion.py | 9 +++++---- protocol.py | 47 ++++++++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 094a6015..ec7db931 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -377,7 +377,7 @@ from edmc_data import ship_name_map from hotkey import hotkeymgr from l10n import Translations from monitor import monitor -from protocol import protocolhandler +import protocol from theme import theme from ttkHyperlinkLabel import HyperlinkLabel @@ -689,7 +689,7 @@ class AppWindow(object): self.w.bind_all('<>', self.onexit) # Updater # Start a protocol handler to handle cAPI registration. Requires main loop to be running. - self.w.after_idle(lambda: protocolhandler.start(self.w)) + self.w.after_idle(lambda: protocol.protocolhandler.start(self.w)) # Load updater after UI creation (for WinSparkle) import update @@ -1698,7 +1698,7 @@ class AppWindow(object): # Frontier auth/CAPI handling logger.info('Closing protocol handler...') - protocolhandler.close() + protocol.protocolhandler.close() logger.info('Closing Frontier CAPI sessions...') companion.session.close() @@ -1900,6 +1900,9 @@ sys.path: {sys.path}''' logger.info("Dropping all fdev tokens as --forget-frontier-auth was passed") companion.Auth.invalidate(None) + # Create protocol handler + protocol.protocolhandler = protocol.get_handler_impl()() + # TODO: unittests in place of these # logger.debug('Test from __main__') # test_logging() diff --git a/companion.py b/companion.py index e61b39a7..16839925 100644 --- a/companion.py +++ b/companion.py @@ -33,7 +33,8 @@ from config import appname, appversion, config from edmc_data import companion_category_map as category_map from EDMCLogging import get_main_logger from monitor import monitor -from protocol import protocolhandler +# from protocol import protocolhandler +import protocol logger = get_main_logger() @@ -375,7 +376,7 @@ class Auth(object): f'&code_challenge={challenge}' f'&code_challenge_method=S256' f'&state={self.state}' - f'&redirect_uri={protocolhandler.redirect}' + f'&redirect_uri={protocol.protocolhandler.redirect}' ) return None @@ -412,7 +413,7 @@ class Auth(object): 'client_id': self.CLIENT_ID, 'code_verifier': self.verifier, 'code': data['code'][0], - 'redirect_uri': protocolhandler.redirect, + 'redirect_uri': protocol.protocolhandler.redirect, } # import http.client as http_client @@ -698,7 +699,7 @@ class Session(object): try: logger.debug('Trying authorize with payload from handler') - self.start_frontier_auth(self.auth.authorize(protocolhandler.lastpayload)) # type: ignore + self.start_frontier_auth(self.auth.authorize(protocol.protocolhandler.lastpayload)) # type: ignore self.auth = None except Exception: diff --git a/protocol.py b/protocol.py index ce5ea042..6db5d5be 100644 --- a/protocol.py +++ b/protocol.py @@ -1,12 +1,13 @@ """protocol handler for cAPI authorisation.""" +# spell-checker: words ntdll GURL alloc wfile instantiatable pyright import os import sys import threading import urllib.error import urllib.parse import urllib.request -from typing import TYPE_CHECKING, Optional +from typing import TYPE_CHECKING, Optional, Type from config import config from constants import appname, protocolhandler_redirect @@ -115,10 +116,10 @@ if sys.platform == 'darwin' and getattr(sys, 'frozen', False): # noqa: C901 # i elif (config.auth_force_edmc_protocol or ( - sys.platform == 'win32' - and getattr(sys, 'frozen', False) - and not is_wine - and not config.auth_force_localserver + sys.platform == 'win32' + and getattr(sys, 'frozen', False) + and not is_wine + and not config.auth_force_localserver )): # spell-checker: words HBRUSH HICON WPARAM wstring WNDCLASS HMENU HGLOBAL from ctypes import windll # type: ignore @@ -415,20 +416,24 @@ else: # Linux / Run from source pass -# singleton +def get_handler_impl() -> Type[GenericProtocolHandler]: + """ + Get the appropriate GenericProtocolHandler for the current system and config. + + :return: An instantiatable GenericProtocolHandler + """ + if sys.platform == 'darwin' and getattr(sys, 'frozen', False): + return DarwinProtocolHandler # pyright: reportUnboundVariable=false + + elif ( + (sys.platform == 'win32' and config.auth_force_edmc_protocol) + or (getattr(sys, 'frozen', False) and not is_wine and not config.auth_force_localserver) + ): + return WindowsProtocolHandler + + else: + return LinuxProtocolHandler + + +# *late init* singleton protocolhandler: GenericProtocolHandler - -if sys.platform == 'darwin' and getattr(sys, 'frozen', False): - protocolhandler = DarwinProtocolHandler() # pyright: reportUnboundVariable=false - -elif ( - sys.platform == 'win32' - and config.auth_force_edmc_protocol or ( - getattr(sys, 'frozen', False) - and not is_wine - and not config.auth_force_localserver - ) - ): - protocolhandler = WindowsProtocolHandler() -else: - protocolhandler = LinuxProtocolHandler() From 30b2d481c4f0166e114f175196319d2cf6950b6a Mon Sep 17 00:00:00 2001 From: A_D Date: Fri, 24 Sep 2021 17:01:57 +0200 Subject: [PATCH 105/527] hack to fix --force-localserver-auth --- EDMarketConnector.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 094a6015..28160c87 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -56,7 +56,6 @@ import killswitch from config import appversion, appversion_nobuild, config, copyright # isort: on -from companion import CAPIData, index_possibly_sparse_list from EDMCLogging import edmclogger, logger, logging from journal_lock import JournalLock, JournalLockResult @@ -881,7 +880,7 @@ class AppWindow(object): self.cooldown() - def export_market_data(self, data: CAPIData) -> bool: # noqa: CCR001 + def export_market_data(self, data: 'CAPIData') -> bool: # noqa: CCR001 """ Export CAPI market data. @@ -1900,6 +1899,10 @@ sys.path: {sys.path}''' logger.info("Dropping all fdev tokens as --forget-frontier-auth was passed") companion.Auth.invalidate(None) + # HACK: n/a | 2021-11-24: --force-localserver-auth does not work if companion is imported early -cont. + # HACK: n/a | 2021-11-24: as we modify config before this is used. + from companion import CAPIData, index_possibly_sparse_list + # TODO: unittests in place of these # logger.debug('Test from __main__') # test_logging() From c0351fec9b62bcb4dd6a5ec3b10ad9185ad7d8dd Mon Sep 17 00:00:00 2001 From: A_D Date: Fri, 24 Sep 2021 17:06:51 +0200 Subject: [PATCH 106/527] missed an import --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 28160c87..675806f6 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -365,7 +365,6 @@ import tkinter.messagebox from tkinter import ttk import commodity -import companion import plug import prefs import stats @@ -1901,6 +1900,7 @@ sys.path: {sys.path}''' # HACK: n/a | 2021-11-24: --force-localserver-auth does not work if companion is imported early -cont. # HACK: n/a | 2021-11-24: as we modify config before this is used. + import companion from companion import CAPIData, index_possibly_sparse_list # TODO: unittests in place of these From f6e4bcfcba9a5c3a5be62c5cac24ca68f6620164 Mon Sep 17 00:00:00 2001 From: A_D Date: Fri, 24 Sep 2021 17:13:00 +0200 Subject: [PATCH 107/527] importing things before you use them is helpful. --- EDMarketConnector.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 675806f6..21edf222 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1893,16 +1893,16 @@ sys.path: {sys.path}''' else: log_locale('After switching to UTF-8 encoding (same language)') - # Do this after locale silliness, just in case - if args.forget_frontier_auth: - logger.info("Dropping all fdev tokens as --forget-frontier-auth was passed") - companion.Auth.invalidate(None) - # HACK: n/a | 2021-11-24: --force-localserver-auth does not work if companion is imported early -cont. # HACK: n/a | 2021-11-24: as we modify config before this is used. import companion from companion import CAPIData, index_possibly_sparse_list + # Do this after locale silliness, just in case + if args.forget_frontier_auth: + logger.info("Dropping all fdev tokens as --forget-frontier-auth was passed") + companion.Auth.invalidate(None) + # TODO: unittests in place of these # logger.debug('Test from __main__') # test_logging() From 0e42358394810510c3e47ecf9f1118cd9d60553a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 17:03:27 +0000 Subject: [PATCH 108/527] build(deps-dev): bump types-requests from 2.25.8 to 2.25.9 Bumps [types-requests](https://github.com/python/typeshed) from 2.25.8 to 2.25.9. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 885b7064..d7d7f009 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.1 mypy==0.910 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.25.8 +types-requests==2.25.9 # Code formatting tools autopep8==1.5.7 From e11b357502ff9165ec160c62dba84fdef0243874 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 1 Oct 2021 08:34:50 +0100 Subject: [PATCH 109/527] EDDN: DEFAULT URL requires `/` on the end The EDDN server config does NOT redirect from /upload to /upload/ --- plugins/eddn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 339baec0..44b8c02c 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -88,7 +88,7 @@ HORIZ_SKU = 'ELITE_HORIZONS_V_PLANETARY_LANDINGS' class EDDN: """EDDN Data export.""" - DEFAULT_URL = 'https://eddn.edcd.io:4430/upload' + DEFAULT_URL = 'https://eddn.edcd.io:4430/upload/' if 'eddn' in debug_senders: DEFAULT_URL = f'http://{edmc_data.DEBUG_WEBSERVER_HOST}:{edmc_data.DEBUG_WEBSERVER_PORT}/eddn' From de44b0d9d6fea4f4755871f9d0346c77ebbe6ca3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 17:03:45 +0000 Subject: [PATCH 110/527] build(deps): bump watchdog from 2.1.5 to 2.1.6 Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.5 to 2.1.6. - [Release notes](https://github.com/gorakhargosh/watchdog/releases) - [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst) - [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.1.5...v2.1.6) --- updated-dependencies: - dependency-name: watchdog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 706d86d4..82a49865 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ certifi==2021.5.30 requests==2.26.0 -watchdog==2.1.5 +watchdog==2.1.6 # Commented out because this doesn't package well with py2exe # infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep From 69e8a81e6c4494e933e104ef114b3910a30fcc55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Oct 2021 17:03:47 +0000 Subject: [PATCH 111/527] build(deps-dev): bump pytest-cov from 2.12.1 to 3.0.0 Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.12.1 to 3.0.0. - [Release notes](https://github.com/pytest-dev/pytest-cov/releases) - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.12.1...v3.0.0) --- updated-dependencies: - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 885b7064..ea8ac908 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -32,7 +32,7 @@ py2exe==0.10.4.1; sys_platform == 'win32' # Testing pytest==6.2.5 -pytest-cov==2.12.1 # Pytest code coverage support +pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==5.5 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==301; sys_platform == 'win32' From 3f5c77f7c3d50b1b5186aed73658fb4ced66aa28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Oct 2021 12:54:17 +0000 Subject: [PATCH 112/527] build(deps-dev): bump coverage[toml] from 5.5 to 6.0.1 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 5.5 to 6.0.1. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/5.5...6.0.1) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index cba99dd6..a1aebfb7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ py2exe==0.10.4.1; sys_platform == 'win32' # Testing pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==5.5 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.0.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==301; sys_platform == 'win32' From c4ba8acb17a99c8e4dbde062bab3c8c0ef0bee34 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 24 Sep 2021 16:19:28 +0100 Subject: [PATCH 113/527] EDDN: Add support for EDDN FSSDiscoveryScan schema from that event * As we're now not sending *all* journal events on the journal schema this refactors only the actual sending in export_journal_entry(), with the other functionality in export_journal_generic(), so that the new export_journal_fssdiscoveryscan() can use export_journal_entry() as well. In the future EDDN will move to a schema per event type, so we'll lose _generic(). Factoring out some things like augmentations into their own functions will come next. --- plugins/eddn.py | 119 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 91 insertions(+), 28 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 44b8c02c..d9575135 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -599,21 +599,16 @@ Msg:\n{msg}''' # this.shipyard = (horizons, shipyard) - def export_journal_entry(self, cmdr: str, is_beta: bool, entry: Mapping[str, Any]) -> None: + def export_journal_entry(self, cmdr, entry, msg): """ Update EDDN with an event from the journal. Additionally if additional lines are cached, it may send those as well. - :param cmdr: the commander under which this upload is made - :param is_beta: whether or not we are in beta mode - :param entry: the journal entry to send + :param cmdr: Commander name as passed in through `journal_entry()`. + :param entry: The full journal event dictionary (due to checks in this function). + :param msg: The EDDN message body to be sent. """ - msg = { - '$schemaRef': f'https://eddn.edcd.io/schemas/journal/1{"/test" if is_beta else ""}', - 'message': entry - } - if self.replayfile or self.load_journal_replay(): # Store the entry self.replaylog.append(json.dumps([cmdr, msg])) @@ -633,6 +628,62 @@ Msg:\n{msg}''' self.send(cmdr, msg) self.parent.children['status']['text'] = '' + def export_journal_generic(self, cmdr: str, is_beta: bool, entry: Mapping[str, Any]) -> None: + """ + Send an EDDN event on the journal schema. + + :param cmdr: the commander under which this upload is made + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/journal/1{"/test" if is_beta else ""}', + 'message': entry + } + this.eddn.export_journal_entry(cmdr, entry, msg) + + def export_journal_fssdiscoveryscan( + self, cmdr: str, system: str, is_beta: bool, entry: Mapping[str, Any] + ) -> Optional[str]: + """ + Send an FSSDiscoveryScan to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + ####################################################################### + # Elisions + entry = filter_localised(entry) + entry.pop('Progress') + ####################################################################### + + ####################################################################### + # Augmentations + ####################################################################### + entry['SystemName'] = system + + if this.systemaddress is None: + logger.warning("this.systemaddress is None, can't add SystemAddress") + return "this.systemaddress is None, can't add SystemAddress" + + entry['SystemAddress'] = this.systemaddress + + if not this.coordinates: + logger.warning("this.coordinates is None, can't add StarPos") + return "this.coordinates is None, can't add StarPos" + + entry['StarPos'] = list(this.coordinates) + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/fssdiscoveryscan/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -773,6 +824,31 @@ def plugin_stop() -> None: logger.debug('Done.') +# Recursively filter '*_Localised' keys from dict +def filter_localised(d: Mapping[str, Any]) -> OrderedDictT[str, Any]: + """ + Remove any dict keys with names ending `_Localised` from a dict. + + :param d: Dict to filter keys of. + :return: The filtered dict. + """ + filtered: OrderedDictT[str, Any] = OrderedDict() + for k, v in d.items(): + if k.endswith('_Localised'): + pass + + elif hasattr(v, 'items'): # dict -> recurse + filtered[k] = filter_localised(v) + + elif isinstance(v, list): # list of dicts -> recurse + filtered[k] = [filter_localised(x) if hasattr(x, 'items') else x for x in v] + + else: + filtered[k] = v + + return filtered + + def journal_entry( # noqa: C901, CCR001 cmdr: str, is_beta: bool, @@ -803,24 +879,6 @@ def journal_entry( # noqa: C901, CCR001 entry = new_data - # Recursively filter '*_Localised' keys from dict - def filter_localised(d: Mapping[str, Any]) -> OrderedDictT[str, Any]: - filtered: OrderedDictT[str, Any] = OrderedDict() - for k, v in d.items(): - if k.endswith('_Localised'): - pass - - elif hasattr(v, 'items'): # dict -> recurse - filtered[k] = filter_localised(v) - - elif isinstance(v, list): # list of dicts -> recurse - filtered[k] = [filter_localised(x) if hasattr(x, 'items') else x for x in v] - - else: - filtered[k] = v - - return filtered - this.on_foot = state['OnFoot'] # Note if we're under Odyssey @@ -849,6 +907,11 @@ def journal_entry( # noqa: C901, CCR001 elif entry['event'] in ('LeaveBody', 'SupercruiseEntry'): this.planet = None + if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: + # Events with their own EDDN schema + if entry['event'].lower() == 'fssdiscoveryscan': + this.eddn.export_journal_fssdiscoveryscan(cmdr, system, is_beta, entry) + # Send interesting events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and (entry['event'] in ('Location', 'FSDJump', 'Docked', 'Scan', 'SAASignalsFound', 'CarrierJump')) and @@ -914,7 +977,7 @@ def journal_entry( # noqa: C901, CCR001 entry['SystemAddress'] = this.systemaddress try: - this.eddn.export_journal_entry(cmdr, is_beta, filter_localised(entry)) + this.eddn.export_journal_generic(cmdr, is_beta, filter_localised(entry)) except requests.exceptions.RequestException as e: logger.debug('Failed in export_journal_entry', exc_info=e) From 1dda61907b72ae05aefd47814533b8c12e0ecde4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 24 Sep 2021 19:09:39 +0100 Subject: [PATCH 114/527] EDDN: TODO on refactoring & return result of fssdiscoveryscan export --- plugins/eddn.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index d9575135..2cd5f2f0 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -661,6 +661,7 @@ Msg:\n{msg}''' ####################################################################### # Augmentations ####################################################################### + # TODO: See if any of this can be factored out into helper functions. entry['SystemName'] = system if this.systemaddress is None: @@ -910,7 +911,7 @@ def journal_entry( # noqa: C901, CCR001 if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: # Events with their own EDDN schema if entry['event'].lower() == 'fssdiscoveryscan': - this.eddn.export_journal_fssdiscoveryscan(cmdr, system, is_beta, entry) + return this.eddn.export_journal_fssdiscoveryscan(cmdr, system, is_beta, entry) # Send interesting events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and From 413f9049f56cb9c51090d96be9ea709bfc19bb7b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 26 Sep 2021 15:06:00 +0100 Subject: [PATCH 115/527] EDDN: Add support for NavBeaconScan on its own schema * Refactors the augmentation code for use by both fssdiscoveryscan and navbeaconscan. --- plugins/eddn.py | 90 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 2cd5f2f0..f4d72673 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -12,7 +12,7 @@ from os.path import join from platform import system from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Mapping, MutableMapping, Optional from typing import OrderedDict as OrderedDictT -from typing import TextIO, Tuple +from typing import TextIO, Tuple, Union import requests @@ -642,6 +642,36 @@ Msg:\n{msg}''' } this.eddn.export_journal_entry(cmdr, entry, msg) + def entry_augment_system_data(self, entry: Dict[str, Any], system_name: str) -> Union[str, Mapping[str, Any]]: + """ + Augment a journal entry with necessary system data. + + :param entry: The journal entry to be augmented. + :param system_name: Name of current star system. + :param systemname_field_name: Name of journal key for system name. + :return: The augmented version of entry. + """ + # If 'SystemName' is there, it's directly from a journal event. + # If that's not there *and* 'StarSystem' isn't either, then we add the latter. + if entry.get('SystemName') is None and entry.get('StarSystem') is None: + entry['StarSystem'] = system_name + + if entry.get('SystemAddress') is None: + if this.systemaddress is None: + logger.warning("this.systemaddress is None, can't add SystemAddress") + return "this.systemaddress is None, can't add SystemAddress" + + entry['SystemAddress'] = this.systemaddress + + if entry.get('StarPos') is None: + if not this.coordinates: + logger.warning("this.coordinates is None, can't add StarPos") + return "this.coordinates is None, can't add StarPos" + + entry['StarPos'] = list(this.coordinates) + + return entry + def export_journal_fssdiscoveryscan( self, cmdr: str, system: str, is_beta: bool, entry: Mapping[str, Any] ) -> Optional[str]: @@ -661,20 +691,11 @@ Msg:\n{msg}''' ####################################################################### # Augmentations ####################################################################### - # TODO: See if any of this can be factored out into helper functions. - entry['SystemName'] = system + ret = this.eddn.entry_augment_system_data(entry, system) + if isinstance(ret, str): + return ret - if this.systemaddress is None: - logger.warning("this.systemaddress is None, can't add SystemAddress") - return "this.systemaddress is None, can't add SystemAddress" - - entry['SystemAddress'] = this.systemaddress - - if not this.coordinates: - logger.warning("this.coordinates is None, can't add StarPos") - return "this.coordinates is None, can't add StarPos" - - entry['StarPos'] = list(this.coordinates) + entry = ret ####################################################################### msg = { @@ -685,6 +706,40 @@ Msg:\n{msg}''' this.eddn.export_journal_entry(cmdr, entry, msg) return None + def export_journal_navbeaconscan( + self, cmdr: str, system: str, is_beta: bool, entry: Mapping[str, Any] + ) -> Optional[str]: + """ + Send an NavBeaconScan to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + # { "timestamp":"2021-09-24T13:57:24Z", "event":"NavBeaconScan", "SystemAddress":670417626481, "NumBodies":18 } + ####################################################################### + # Elisions + entry = filter_localised(entry) + ####################################################################### + + ####################################################################### + # Augmentations + ####################################################################### + ret = this.eddn.entry_augment_system_data(entry, system) + if isinstance(ret, str): + return ret + + entry = ret + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/navbeaconscan/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -908,12 +963,15 @@ def journal_entry( # noqa: C901, CCR001 elif entry['event'] in ('LeaveBody', 'SupercruiseEntry'): this.planet = None + # Events with their own EDDN schema if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: - # Events with their own EDDN schema if entry['event'].lower() == 'fssdiscoveryscan': return this.eddn.export_journal_fssdiscoveryscan(cmdr, system, is_beta, entry) - # Send interesting events to EDDN, but not when on a crew + if entry['event'].lower() == 'navbeaconscan': + return this.eddn.export_journal_navbeaconscan(cmdr, system, is_beta, entry) + + # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and (entry['event'] in ('Location', 'FSDJump', 'Docked', 'Scan', 'SAASignalsFound', 'CarrierJump')) and ('StarPos' in entry or this.coordinates)): From 9c611d73d5d1a928092eddd9c1aa2a871b7e5441 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 26 Sep 2021 15:17:37 +0100 Subject: [PATCH 116/527] EDDN: TODO for dropping messages if we get a clear HTTP error i.e. message not matching schema --- plugins/eddn.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index f4d72673..64ea374d 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -266,6 +266,9 @@ Msg:\n{msg}''' if not len(self.replaylog) % self.REPLAYFLUSH: self.flush() + # TODO: Something here needs to handle, e.g. HTTP 400, and take the message + # in question out of replaylog, else we'll keep retrying a bad message + # forever. except requests.exceptions.HTTPError as e: status['text'] = self.http_error_to_log(e) From f97cf0897a34476801de4c9d9a996f6a4b472edf Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 26 Sep 2021 15:59:52 +0100 Subject: [PATCH 117/527] EDDN: Add CodexEntry on its own schema This requires a tweak to `entry_augment_system_data()` as we now also have 'System' as a possible key for a system name. --- plugins/eddn.py | 69 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 64ea374d..cd4ccf00 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -654,9 +654,9 @@ Msg:\n{msg}''' :param systemname_field_name: Name of journal key for system name. :return: The augmented version of entry. """ - # If 'SystemName' is there, it's directly from a journal event. - # If that's not there *and* 'StarSystem' isn't either, then we add the latter. - if entry.get('SystemName') is None and entry.get('StarSystem') is None: + # If 'SystemName' or 'System' is there, it's directly from a journal event. + # If they're not there *and* 'StarSystem' isn't either, then we add the latter. + if entry.get('SystemName') is None and entry.get('System') is None and entry.get('StarSystem') is None: entry['StarSystem'] = system_name if entry.get('SystemAddress') is None: @@ -710,12 +710,13 @@ Msg:\n{msg}''' return None def export_journal_navbeaconscan( - self, cmdr: str, system: str, is_beta: bool, entry: Mapping[str, Any] + self, cmdr: str, system_name: str, is_beta: bool, entry: Mapping[str, Any] ) -> Optional[str]: """ Send an NavBeaconScan to EDDN on the correct schema. :param cmdr: the commander under which this upload is made + :param system_name: Name of the current system. :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send """ @@ -728,7 +729,7 @@ Msg:\n{msg}''' ####################################################################### # Augmentations ####################################################################### - ret = this.eddn.entry_augment_system_data(entry, system) + ret = this.eddn.entry_augment_system_data(entry, system_name) if isinstance(ret, str): return ret @@ -743,6 +744,61 @@ Msg:\n{msg}''' this.eddn.export_journal_entry(cmdr, entry, msg) return None + def export_journal_codexentry( + self, cmdr: str, is_beta: bool, entry: Mapping[str, Any] + ) -> Optional[str]: + """ + Send a CodexEntry to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + # { + # "timestamp":"2021-09-26T12:29:39Z", + # "event":"CodexEntry", + # "EntryID":1400414, + # "Name":"$Codex_Ent_Gas_Vents_SilicateVapourGeysers_Name;", + # "Name_Localised":"Silicate Vapour Gas Vent", + # "SubCategory":"$Codex_SubCategory_Geology_and_Anomalies;", + # "SubCategory_Localised":"Geology and anomalies", + # "Category":"$Codex_Category_Biology;", + # "Category_Localised":"Biological and Geological", + # "Region":"$Codex_RegionName_18;", + # "Region_Localised":"Inner Orion Spur", + # "System":"Bestia", + # "SystemAddress":147916327267, + # "Latitude":23.197777, "Longitude":51.803349, + # "IsNewEntry":true, + # "VoucherAmount":50000 + # } + ####################################################################### + # Elisions + entry = filter_localised(entry) + # Keys specific to this event + for k in ('IsNewEntry', 'NewTraitsDiscovered'): + if entry.get(k) is not None: + del entry[k] + ####################################################################### + + ####################################################################### + # Augmentations + ####################################################################### + ret = this.eddn.entry_augment_system_data(entry, entry['System']) + if isinstance(ret, str): + return ret + + entry = ret + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/codexentry/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -974,6 +1030,9 @@ def journal_entry( # noqa: C901, CCR001 if entry['event'].lower() == 'navbeaconscan': return this.eddn.export_journal_navbeaconscan(cmdr, system, is_beta, entry) + if entry['event'].lower() == 'codexentry': + return this.eddn.export_journal_codexentry(cmdr, is_beta, entry) + # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and (entry['event'] in ('Location', 'FSDJump', 'Docked', 'Scan', 'SAASignalsFound', 'CarrierJump')) and From 7081a5a3abe9d7829280f0625561a842f3ca9671 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 26 Sep 2021 16:14:09 +0100 Subject: [PATCH 118/527] EDDN: Send ScanBaryCentre on correct schema --- plugins/eddn.py | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index cd4ccf00..b506c709 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -799,6 +799,53 @@ Msg:\n{msg}''' this.eddn.export_journal_entry(cmdr, entry, msg) return None + def export_journal_scanbarycentre( + self, cmdr: str, is_beta: bool, entry: Mapping[str, Any] + ) -> Optional[str]: + """ + Send a ScanBaryCentre to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + # { + # "timestamp":"2021-09-26T11:55:03Z", + # "event":"ScanBaryCentre", + # "StarSystem":"Khruvani", + # "SystemAddress":13864557159793, + # "BodyID":21, + # "SemiMajorAxis":863683605194.091797, + # "Eccentricity":0.001446, + # "OrbitalInclination":-0.230714, + # "Periapsis":214.828581, + # "OrbitalPeriod":658474677.801132, + # "AscendingNode":21.188568, + # "MeanAnomaly":208.765388 + # } + ####################################################################### + # Elisions + entry = filter_localised(entry) + ####################################################################### + + ####################################################################### + # Augmentations + ####################################################################### + ret = this.eddn.entry_augment_system_data(entry, entry['StarSystem']) + if isinstance(ret, str): + return ret + + entry = ret + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/scanbarycentre/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -1033,6 +1080,9 @@ def journal_entry( # noqa: C901, CCR001 if entry['event'].lower() == 'codexentry': return this.eddn.export_journal_codexentry(cmdr, is_beta, entry) + if entry['event'].lower() == 'scanbarycentre': + return this.eddn.export_journal_scanbarycentre(cmdr, is_beta, entry) + # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and (entry['event'] in ('Location', 'FSDJump', 'Docked', 'Scan', 'SAASignalsFound', 'CarrierJump')) and From 0ffbb4dac96f96d73c5e65f0a496e3289bcd422e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 26 Sep 2021 16:37:01 +0100 Subject: [PATCH 119/527] EDDN: Send 'NavRoute' data on appropriate schema Yes, there's some lovely mis-match between Mapping and Dict type to work around. Mapping complains about lack of __delitem__, so saying it's a Dict instead and ensuring that matches at the call site. --- plugins/eddn.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index b506c709..46c011a3 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -846,6 +846,62 @@ Msg:\n{msg}''' this.eddn.export_journal_entry(cmdr, entry, msg) return None + def export_journal_navroute( + self, cmdr: str, is_beta: bool, entry: Dict[str, Any] + ) -> Optional[str]: + """ + Send a NavRoute to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + # { + # "timestamp":"2021-09-24T14:33:15Z", + # "event":"NavRoute", + # "Route":[ + # { + # "StarSystem":"Ross 332", + # "SystemAddress":3657198211778, + # "StarPos":[-43.62500,-23.15625,-74.12500], + # "StarClass":"K" + # }, + # { + # "StarSystem":"BD+44 1040", + # "SystemAddress":2832564490946, + # "StarPos":[-31.56250,1.84375,-92.37500], + # "StarClass":"K" + # }, + # { + # "StarSystem":"Aonga", + # "SystemAddress":6680855188162, + # "StarPos":[-34.46875,9.53125,-90.87500], + # "StarClass":"M" + # } + # ] + # } + ####################################################################### + # Elisions + ####################################################################### + # This will reject with the Odyssey flag present + if entry.get('odyssey') is not None: + del entry['odyssey'] + ####################################################################### + + ####################################################################### + # Augmentations + ####################################################################### + # None + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/navroute/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -1083,6 +1139,9 @@ def journal_entry( # noqa: C901, CCR001 if entry['event'].lower() == 'scanbarycentre': return this.eddn.export_journal_scanbarycentre(cmdr, is_beta, entry) + if entry['event'].lower() == 'navroute': + return this.eddn.export_journal_navroute(cmdr, is_beta, dict(entry)) + # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and (entry['event'] in ('Location', 'FSDJump', 'Docked', 'Scan', 'SAASignalsFound', 'CarrierJump')) and From ba20599511baee903206b90084a2adfe93b03883 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 27 Sep 2021 14:46:18 +0100 Subject: [PATCH 120/527] EDDN: Make comment about removing odyssey flag a WORKAROUND This is for the NavRoute handling. --- plugins/eddn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 46c011a3..35685646 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -883,7 +883,7 @@ Msg:\n{msg}''' ####################################################################### # Elisions ####################################################################### - # This will reject with the Odyssey flag present + # WORKAROUND WIP EDDN schema | 2021-09-27: This will reject with the Odyssey flag present if entry.get('odyssey') is not None: del entry['odyssey'] ####################################################################### From e1d547460be8ded08e2671bb1513e1a375690efc Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 27 Sep 2021 14:50:11 +0100 Subject: [PATCH 121/527] EDDN: Add type hints back to new `export_journal_entry()` --- plugins/eddn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 35685646..bee12a35 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -602,7 +602,7 @@ Msg:\n{msg}''' # this.shipyard = (horizons, shipyard) - def export_journal_entry(self, cmdr, entry, msg): + def export_journal_entry(self, cmdr: str, entry: Mapping[str, Any], msg: Mapping[str, Any]) -> None: """ Update EDDN with an event from the journal. From 84ef77197df8235979b7677e9789bce9dfd11956 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 27 Sep 2021 14:51:10 +0100 Subject: [PATCH 122/527] EDDN: Use MutableMapping when needing to update a Mapping, not Dict --- plugins/eddn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index bee12a35..471e7ef7 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -847,7 +847,7 @@ Msg:\n{msg}''' return None def export_journal_navroute( - self, cmdr: str, is_beta: bool, entry: Dict[str, Any] + self, cmdr: str, is_beta: bool, entry: MutableMapping[str, Any] ) -> Optional[str]: """ Send a NavRoute to EDDN on the correct schema. @@ -1140,7 +1140,7 @@ def journal_entry( # noqa: C901, CCR001 return this.eddn.export_journal_scanbarycentre(cmdr, is_beta, entry) if entry['event'].lower() == 'navroute': - return this.eddn.export_journal_navroute(cmdr, is_beta, dict(entry)) + return this.eddn.export_journal_navroute(cmdr, is_beta, entry) # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and From 554692677658c31fccc33832fcd9d39d8b40b1c7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 27 Sep 2021 14:53:55 +0100 Subject: [PATCH 123/527] EDDN: Use 'if key (not) in dict:' rather than `.get() is (not) None` --- plugins/eddn.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 471e7ef7..e5b6da05 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -656,17 +656,17 @@ Msg:\n{msg}''' """ # If 'SystemName' or 'System' is there, it's directly from a journal event. # If they're not there *and* 'StarSystem' isn't either, then we add the latter. - if entry.get('SystemName') is None and entry.get('System') is None and entry.get('StarSystem') is None: + if 'SystemName' not in entry and 'System' not in entry and 'StarSystem' not in entry: entry['StarSystem'] = system_name - if entry.get('SystemAddress') is None: + if 'SystemAddress' not in entry: if this.systemaddress is None: logger.warning("this.systemaddress is None, can't add SystemAddress") return "this.systemaddress is None, can't add SystemAddress" entry['SystemAddress'] = this.systemaddress - if entry.get('StarPos') is None: + if 'StarPos' not in entry: if not this.coordinates: logger.warning("this.coordinates is None, can't add StarPos") return "this.coordinates is None, can't add StarPos" @@ -777,7 +777,7 @@ Msg:\n{msg}''' entry = filter_localised(entry) # Keys specific to this event for k in ('IsNewEntry', 'NewTraitsDiscovered'): - if entry.get(k) is not None: + if k in entry: del entry[k] ####################################################################### @@ -884,7 +884,7 @@ Msg:\n{msg}''' # Elisions ####################################################################### # WORKAROUND WIP EDDN schema | 2021-09-27: This will reject with the Odyssey flag present - if entry.get('odyssey') is not None: + if 'odyssey' in entry: del entry['odyssey'] ####################################################################### From b82d25ee07ab73fe6069232e872cc13682a42000 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 10 Oct 2021 14:31:40 +0100 Subject: [PATCH 124/527] EDDN: Start tracking Status.json BodyName --- plugins/eddn.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index e5b6da05..99a8f12b 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -53,6 +53,8 @@ class This: self.systemaddress: Optional[str] = None self.coordinates: Optional[Tuple] = None self.planet: Optional[str] = None + # Track Status.json data + self.status_bodyname: Optional[str] = None # Avoid duplicates self.marketId: Optional[str] = None @@ -1337,3 +1339,18 @@ def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY logger.error(f'ships type is {type(ships)}') return economies_colony or modules_horizons or ship_horizons + + +def dashboard_entry(cmdr: str, is_beta: bool, entry: Dict[str, Any]) -> None: + """ + Process Status.json data to track things like current Body. + + :param cmdr: Current Commander name. + :param is_beta: Whether non-live game version was detected. + :param entry: The latest Status.json data. + """ + if 'BodyName' in entry: + this.status_bodyname = entry['BodyName'] + + else: + this.status_bodyname = None From 870086872496ed0793fd847b904ce23935b616ab Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 10 Oct 2021 14:32:12 +0100 Subject: [PATCH 125/527] EDDN: Rename this.planet to this.bodyname for consistency --- plugins/eddn.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 99a8f12b..e97c170a 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -52,7 +52,7 @@ class This: # Track location to add to Journal events self.systemaddress: Optional[str] = None self.coordinates: Optional[Tuple] = None - self.planet: Optional[str] = None + self.bodyname: Optional[str] = None # Track Status.json data self.status_bodyname: Optional[str] = None @@ -1108,10 +1108,10 @@ def journal_entry( # noqa: C901, CCR001 # Track location if entry['event'] in ('Location', 'FSDJump', 'Docked', 'CarrierJump'): if entry['event'] in ('Location', 'CarrierJump'): - this.planet = entry.get('Body') if entry.get('BodyType') == 'Planet' else None + this.bodyname = entry.get('Body') if entry.get('BodyType') == 'Planet' else None elif entry['event'] == 'FSDJump': - this.planet = None + this.bodyname = None if 'StarPos' in entry: this.coordinates = tuple(entry['StarPos']) @@ -1122,10 +1122,10 @@ def journal_entry( # noqa: C901, CCR001 this.systemaddress = entry.get('SystemAddress') # type: ignore elif entry['event'] == 'ApproachBody': - this.planet = entry['Body'] + this.bodyname = entry['Body'] elif entry['event'] in ('LeaveBody', 'SupercruiseEntry'): - this.planet = None + this.bodyname = None # Events with their own EDDN schema if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: @@ -1176,8 +1176,8 @@ def journal_entry( # noqa: C901, CCR001 ] # add planet to Docked event for planetary stations if known - if entry['event'] == 'Docked' and this.planet: - entry['Body'] = this.planet + if entry['event'] == 'Docked' and this.bodyname: + entry['Body'] = this.bodyname entry['BodyType'] = 'Planet' # add mandatory StarSystem, StarPos and SystemAddress properties to Scan events From 50f03ae7536be69a24a8ce302507afda6337a75b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 10 Oct 2021 14:37:20 +0100 Subject: [PATCH 126/527] EDDN: codexentry: Set BodyName if available from Status.json --- plugins/eddn.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index e97c170a..dc326653 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -647,7 +647,11 @@ Msg:\n{msg}''' } this.eddn.export_journal_entry(cmdr, entry, msg) - def entry_augment_system_data(self, entry: Dict[str, Any], system_name: str) -> Union[str, Mapping[str, Any]]: + def entry_augment_system_data( + self, + entry: MutableMapping[str, Any], + system_name: str + ) -> Union[str, MutableMapping[str, Any]]: """ Augment a journal entry with necessary system data. @@ -747,7 +751,7 @@ Msg:\n{msg}''' return None def export_journal_codexentry( - self, cmdr: str, is_beta: bool, entry: Mapping[str, Any] + self, cmdr: str, is_beta: bool, entry: MutableMapping[str, Any] ) -> Optional[str]: """ Send a CodexEntry to EDDN on the correct schema. @@ -786,11 +790,16 @@ Msg:\n{msg}''' ####################################################################### # Augmentations ####################################################################### + # General 'system' augmentations ret = this.eddn.entry_augment_system_data(entry, entry['System']) if isinstance(ret, str): return ret entry = ret + + # Body Name and ID, if available + if this.status_bodyname is not None: + entry['BodyName'] = this.status_bodyname ####################################################################### msg = { From d7eacd253cbc9b930a1f98576e3d303b8dd11877 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 10 Oct 2021 14:43:01 +0100 Subject: [PATCH 127/527] EDDN: Track BodyID from Journal events * Also renames all of the body name/ID 'this' variables to snake case. --- plugins/eddn.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index dc326653..d22b451d 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -52,9 +52,10 @@ class This: # Track location to add to Journal events self.systemaddress: Optional[str] = None self.coordinates: Optional[Tuple] = None - self.bodyname: Optional[str] = None + self.body_name: Optional[str] = None + self.body_id: Optional[int] = None # Track Status.json data - self.status_bodyname: Optional[str] = None + self.status_body_name: Optional[str] = None # Avoid duplicates self.marketId: Optional[str] = None @@ -798,8 +799,8 @@ Msg:\n{msg}''' entry = ret # Body Name and ID, if available - if this.status_bodyname is not None: - entry['BodyName'] = this.status_bodyname + if this.status_body_name is not None: + entry['BodyName'] = this.status_body_name ####################################################################### msg = { @@ -1117,10 +1118,15 @@ def journal_entry( # noqa: C901, CCR001 # Track location if entry['event'] in ('Location', 'FSDJump', 'Docked', 'CarrierJump'): if entry['event'] in ('Location', 'CarrierJump'): - this.bodyname = entry.get('Body') if entry.get('BodyType') == 'Planet' else None + if entry.get('BodyType') == 'Planet': + this.body_name = entry.get('Body') + this.body_id = entry.get('BodyID') + + else: + this.body_name = None elif entry['event'] == 'FSDJump': - this.bodyname = None + this.body_name = None if 'StarPos' in entry: this.coordinates = tuple(entry['StarPos']) @@ -1131,10 +1137,10 @@ def journal_entry( # noqa: C901, CCR001 this.systemaddress = entry.get('SystemAddress') # type: ignore elif entry['event'] == 'ApproachBody': - this.bodyname = entry['Body'] + this.body_name = entry['Body'] elif entry['event'] in ('LeaveBody', 'SupercruiseEntry'): - this.bodyname = None + this.body_name = None # Events with their own EDDN schema if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: @@ -1185,8 +1191,8 @@ def journal_entry( # noqa: C901, CCR001 ] # add planet to Docked event for planetary stations if known - if entry['event'] == 'Docked' and this.bodyname: - entry['Body'] = this.bodyname + if entry['event'] == 'Docked' and this.body_name: + entry['Body'] = this.body_name entry['BodyType'] = 'Planet' # add mandatory StarSystem, StarPos and SystemAddress properties to Scan events @@ -1359,7 +1365,7 @@ def dashboard_entry(cmdr: str, is_beta: bool, entry: Dict[str, Any]) -> None: :param entry: The latest Status.json data. """ if 'BodyName' in entry: - this.status_bodyname = entry['BodyName'] + this.status_body_name = entry['BodyName'] else: - this.status_bodyname = None + this.status_body_name = None From 15ea858c6b777d8c98a7cf45393c3dad3438d44d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 10 Oct 2021 14:55:46 +0100 Subject: [PATCH 128/527] EDDN: codexentry: Use BodyID if available --- plugins/eddn.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index d22b451d..48ed2b9f 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -799,8 +799,13 @@ Msg:\n{msg}''' entry = ret # Body Name and ID, if available + # We only trust the Status.json value if this.status_body_name is not None: entry['BodyName'] = this.status_body_name + # And thus only set BodyID, which will be from journal events, if + # the Journal-sourced Body Name matches + if this.status_body_name == this.body_name: + entry['BodyID'] = this.body_id ####################################################################### msg = { From 72f584481af71666a59c3ad978b3f43a961be7b4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 10 Oct 2021 15:01:16 +0100 Subject: [PATCH 129/527] EDDN: Add --eddn-tracking-ui CL arg This will only work on startup for now, with it present/active the EDDN plugin will add a UI frame to show what it's tracking. Intended for developer use only. --- EDMarketConnector.py | 6 ++++++ config.py | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 21edf222..95426754 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -155,6 +155,12 @@ if __name__ == '__main__': # noqa: C901 '--eddn-url', help='Specify an alternate EDDN upload URL', ) + + parser.add_argument( + '--eddn-tracking-ui', + help='Have EDDN plugin show what it is tracking', + action='store_true', + ) ########################################################################### args = parser.parse_args() diff --git a/config.py b/config.py index 7a51547a..05cacd89 100644 --- a/config.py +++ b/config.py @@ -208,6 +208,7 @@ class AbstractConfig(abc.ABC): __auth_force_localserver = False # Should we use localhost for auth callback ? __auth_force_edmc_protocol = False # Should we force edmc:// protocol ? __eddn_url = None # Non-default EDDN URL + __eddn_tracking_ui = False # Show EDDN tracking UI ? def __init__(self) -> None: self.home_path = pathlib.Path.home() @@ -264,6 +265,19 @@ class AbstractConfig(abc.ABC): """ return self.__eddn_url + def set_eddn_tracking_ui(self): + """Activate EDDN tracking UI.""" + self.__eddn_tracking_ui = True + + @property + def eddn_tracking_ui(self) -> bool: + """ + Determine if the EDDN tracking UI be shown. + + :return: bool - Should tracking UI be active? + """ + return self.__eddn_tracking_ui + @property def app_dir(self) -> str: """Return a string version of app_dir.""" From dd8ec061d300781ceac821b3a62db194ce1acd52 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 10 Oct 2021 15:40:41 +0100 Subject: [PATCH 130/527] EDDN: Dummy tracking UI to determine layout --- EDMarketConnector.py | 3 +++ plugins/eddn.py | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 95426754..593d3adf 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -189,6 +189,9 @@ if __name__ == '__main__': # noqa: C901 if args.eddn_url: config.set_eddn_url(args.eddn_url) + if args.eddn_tracking_ui: + config.set_eddn_tracking_ui() + if args.force_edmc_protocol: if sys.platform == 'win32': config.set_auth_force_edmc_protocol() diff --git a/plugins/eddn.py b/plugins/eddn.py index 48ed2b9f..28c65d95 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -79,6 +79,12 @@ class This: self.eddn_delay: tk.IntVar self.eddn_delay_button: nb.Checkbutton + # Tracking UI + self.ui: Optional[tk.Frame] = None + self.ui_j_body_name: Optional[tk.Label] = None + self.ui_j_body_id: Optional[tk.Label] = None + self.ui_s_body_name: Optional[tk.Label] = None + this = This() @@ -942,7 +948,7 @@ def plugin_start3(plugin_dir: str) -> str: return 'EDDN' -def plugin_app(parent: tk.Tk) -> None: +def plugin_app(parent: tk.Tk) -> Optional[tk.Frame]: """ Set up any plugin-specific UI. @@ -953,6 +959,7 @@ def plugin_app(parent: tk.Tk) -> None: necessary. :param parent: tkinter parent frame. + :return: Optional tk.Frame, if the tracking UI is active. """ this.parent = parent this.eddn = EDDN(parent) @@ -961,6 +968,32 @@ def plugin_app(parent: tk.Tk) -> None: # Shouldn't happen - don't bother localizing this.parent.children['status']['text'] = 'Error: Is another copy of this app already running?' + if config.eddn_tracking_ui: + this.ui = tk.Frame(parent) + + row = this.ui.grid_size()[1] + journal_body_name_label = tk.Label(this.ui, text="J:BodyName:") + journal_body_name_label.grid(row=row, column=0, sticky=tk.W) + this.ui_j_body_name = tk.Label(this.ui, text='<>') + this.ui_j_body_name.grid(row=row, column=1, sticky=tk.E) + row += 1 + + journal_body_id_label = tk.Label(this.ui, text="J:BodyID:") + journal_body_id_label.grid(row=row, column=0, sticky=tk.W) + this.ui_j_body_id = tk.Label(this.ui, text='<>') + this.ui_j_body_id.grid(row=row, column=1, sticky=tk.E) + row += 1 + + status_body_name_label = tk.Label(this.ui, text="S:BodyName:") + status_body_name_label.grid(row=row, column=0, sticky=tk.W) + this.ui_s_body_name = tk.Label(this.ui, text='<>') + this.ui_s_body_name.grid(row=row, column=1, sticky=tk.E) + row += 1 + + return this.ui + + return None + def plugin_prefs(parent, cmdr: str, is_beta: bool) -> Frame: """ From 1637dc0f5fb3c65cf5b1a5524d1913eb307682fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 17:03:22 +0000 Subject: [PATCH 131/527] build(deps-dev): bump pywin32 from 301 to 302 Bumps [pywin32](https://github.com/mhammond/pywin32) from 301 to 302. - [Release notes](https://github.com/mhammond/pywin32/releases) - [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt) - [Commits](https://github.com/mhammond/pywin32/commits) --- updated-dependencies: - dependency-name: pywin32 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a1aebfb7..54469037 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -35,7 +35,7 @@ pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.0.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. -pywin32==301; sys_platform == 'win32' +pywin32==302; sys_platform == 'win32' # All of the normal requirements From 7be9bd1883004202d2ddd782b459be74bf82fa3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 17:03:25 +0000 Subject: [PATCH 132/527] build(deps-dev): bump flake8-comprehensions from 3.6.1 to 3.7.0 Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.6.1 to 3.7.0. - [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases) - [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst) - [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.6.1...3.7.0) --- updated-dependencies: - dependency-name: flake8-comprehensions dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a1aebfb7..5d2846a7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ wheel flake8==3.9.2 flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 -flake8-comprehensions==3.6.1 +flake8-comprehensions==3.7.0 flake8-docstrings==1.6.0 isort==5.9.3 flake8-isort==4.0.0 From 91ff8a5d3d5766a890b9d1fc2cc346ef3dcc61ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 17:03:32 +0000 Subject: [PATCH 133/527] build(deps): bump certifi from 2021.5.30 to 2021.10.8 Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.5.30 to 2021.10.8. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/compare/2021.05.30...2021.10.08) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 82a49865..01e635c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -certifi==2021.5.30 +certifi==2021.10.8 requests==2.26.0 watchdog==2.1.6 # Commented out because this doesn't package well with py2exe From c36cc6203994a0ee14f7a61f1e582f7fbbbbcabd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 17:05:23 +0000 Subject: [PATCH 134/527] build(deps-dev): bump flake8 from 3.9.2 to 4.0.1 Bumps [flake8](https://github.com/pycqa/flake8) from 3.9.2 to 4.0.1. - [Release notes](https://github.com/pycqa/flake8/releases) - [Commits](https://github.com/pycqa/flake8/compare/3.9.2...4.0.1) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 216a0016..0c64ab59 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ wheel # Static analysis tools -flake8==3.9.2 +flake8==4.0.1 flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 From 2ef9d9e3c3a5ac30ae6bb884bb772923eda30a12 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 12 Oct 2021 13:06:38 +0100 Subject: [PATCH 135/527] EDDN: BodyName/ID tracking tested for simple body * The Tracking UI is now up and running. * Some of the tracking corrected: - Set BodyID from ApproachBody. - Do not clear values on SupercruiseEntry, allow either FSDJump or LeaveBody to do this. - Clear the values if we detect the Main Menu music track (when you exit to the menu, not just when you look at the menu whilst in-game). * Various comments added to help with documenting the tracking for EDDN uploaders. --- plugins/eddn.py | 66 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 28c65d95..1225cd59 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -80,10 +80,10 @@ class This: self.eddn_delay_button: nb.Checkbutton # Tracking UI - self.ui: Optional[tk.Frame] = None - self.ui_j_body_name: Optional[tk.Label] = None - self.ui_j_body_id: Optional[tk.Label] = None - self.ui_s_body_name: Optional[tk.Label] = None + self.ui: tk.Frame + self.ui_j_body_name: tk.Label + self.ui_j_body_id: tk.Label + self.ui_s_body_name: tk.Label this = This() @@ -805,13 +805,14 @@ Msg:\n{msg}''' entry = ret # Body Name and ID, if available - # We only trust the Status.json value - if this.status_body_name is not None: + # Status.json BodyName is set as soon as the Orbital Cruise/Glide HUD + # activates. + # Journal ApproachBody only occurs once inside Orbital Cruise altitude. + # So we check that both are set, and match, then use the Status.json + # value. + if this.status_body_name is not None and this.status_body_name == this.body_name: entry['BodyName'] = this.status_body_name - # And thus only set BodyID, which will be from journal events, if - # the Journal-sourced Body Name matches - if this.status_body_name == this.body_name: - entry['BodyID'] = this.body_id + entry['BodyID'] = this.body_id ####################################################################### msg = { @@ -974,19 +975,19 @@ def plugin_app(parent: tk.Tk) -> Optional[tk.Frame]: row = this.ui.grid_size()[1] journal_body_name_label = tk.Label(this.ui, text="J:BodyName:") journal_body_name_label.grid(row=row, column=0, sticky=tk.W) - this.ui_j_body_name = tk.Label(this.ui, text='<>') + this.ui_j_body_name = tk.Label(this.ui, name='eddn_track_j_body_name', anchor=tk.W) this.ui_j_body_name.grid(row=row, column=1, sticky=tk.E) row += 1 journal_body_id_label = tk.Label(this.ui, text="J:BodyID:") journal_body_id_label.grid(row=row, column=0, sticky=tk.W) - this.ui_j_body_id = tk.Label(this.ui, text='<>') + this.ui_j_body_id = tk.Label(this.ui, name='eddn_track_j_body_id', anchor=tk.W) this.ui_j_body_id.grid(row=row, column=1, sticky=tk.E) row += 1 status_body_name_label = tk.Label(this.ui, text="S:BodyName:") status_body_name_label.grid(row=row, column=0, sticky=tk.W) - this.ui_s_body_name = tk.Label(this.ui, text='<>') + this.ui_s_body_name = tk.Label(this.ui, name='eddn_track_s_body_name', anchor=tk.W) this.ui_s_body_name.grid(row=row, column=1, sticky=tk.E) row += 1 @@ -995,6 +996,26 @@ def plugin_app(parent: tk.Tk) -> Optional[tk.Frame]: return None +def tracking_ui_update() -> None: + """Update the Tracking UI with current data.""" + if this.body_name is None: + this.ui_j_body_name['text'] = '≪None≫' + else: + this.ui_j_body_name['text'] = this.body_name + + if this.body_id is None: + this.ui_j_body_id['text'] = '≪None≫' + else: + this.ui_j_body_id['text'] = str(this.body_id) + + if this.status_body_name is None: + this.ui_s_body_name['text'] = '≪None≫' + else: + this.ui_s_body_name['text'] = this.status_body_name + + this.ui.update_idletasks() + + def plugin_prefs(parent, cmdr: str, is_beta: bool) -> Frame: """ Set up Preferences pane for this plugin. @@ -1165,6 +1186,7 @@ def journal_entry( # noqa: C901, CCR001 elif entry['event'] == 'FSDJump': this.body_name = None + this.body_id = None if 'StarPos' in entry: this.coordinates = tuple(entry['StarPos']) @@ -1176,9 +1198,21 @@ def journal_entry( # noqa: C901, CCR001 elif entry['event'] == 'ApproachBody': this.body_name = entry['Body'] + this.body_id = entry.get('BodyID') - elif entry['event'] in ('LeaveBody', 'SupercruiseEntry'): + elif entry['event'] == 'LeaveBody': + # NB: **NOT** SupercruiseEntry, because we won't get a fresh + # ApproachBody if we don't leave Orbital Cruise and land again. + # *This* is triggered when you go above Orbital Cruise altitude. + # Status.json BodyName clears when the OC/Glide HUD is deactivated. this.body_name = None + this.body_id = None + + elif entry['event'] == 'Music': + if entry['MusicTrack'] == 'MainMenu': + this.body_name = None + this.body_id = None + this.status_body_name = None # Events with their own EDDN schema if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: @@ -1307,6 +1341,8 @@ def journal_entry( # noqa: C901, CCR001 logger.debug(f'Failed exporting {entry["event"]}', exc_info=e) return str(e) + tracking_ui_update() + return None @@ -1407,3 +1443,5 @@ def dashboard_entry(cmdr: str, is_beta: bool, entry: Dict[str, Any]) -> None: else: this.status_body_name = None + + tracking_ui_update() From 9a79c084a87cee90dcf6936bcbc41b5b3809b5ef Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 12 Oct 2021 13:12:21 +0100 Subject: [PATCH 136/527] requirements-dev: Step flake8 back down to 3.9.2 for now flake8-isort needs to publish a release that allows for >= 4 --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0c64ab59..216a0016 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ wheel # Static analysis tools -flake8==4.0.1 +flake8==3.9.2 flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 From a949b408a3735fea4d4b16da827703c263a6cd6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 17:04:45 +0000 Subject: [PATCH 137/527] build(deps-dev): bump types-requests from 2.25.9 to 2.25.10 Bumps [types-requests](https://github.com/python/typeshed) from 2.25.9 to 2.25.10. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 216a0016..5acb8c76 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.1 mypy==0.910 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.25.9 +types-requests==2.25.10 # Code formatting tools autopep8==1.5.7 From 24597e78e925a44ffe1517911649fb6edf1296b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 17:04:54 +0000 Subject: [PATCH 138/527] build(deps-dev): bump coverage[toml] from 6.0.1 to 6.0.2 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.0.1...6.0.2) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 216a0016..9e8f60c9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ py2exe==0.10.4.1; sys_platform == 'win32' # Testing pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.0.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.0.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==302; sys_platform == 'win32' From b551af45b8ea13a21adb75b160537e882ec0f250 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 17:04:56 +0000 Subject: [PATCH 139/527] build(deps-dev): bump flake8-noqa from 1.1.0 to 1.2.0 Bumps [flake8-noqa](https://github.com/plinss/flake8-noqa) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/plinss/flake8-noqa/releases) - [Commits](https://github.com/plinss/flake8-noqa/compare/v1.1.0...v1.2.0) --- updated-dependencies: - dependency-name: flake8-noqa dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 216a0016..bebc2799 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ flake8-docstrings==1.6.0 isort==5.9.3 flake8-isort==4.0.0 flake8-json==21.7.0 -flake8-noqa==1.1.0 +flake8-noqa==1.2.0 flake8-polyfill==1.0.2 flake8-use-fstring==1.1 From 60f3b524e2a644cb8afe07ef8595b3bc55b0636d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 14 Oct 2021 13:04:52 +0100 Subject: [PATCH 140/527] EDDN: codexentry: Always set BodyName from Status.json, ID if Journal matches Partial data is better than no data, or bad data. So if Status.json BodyName is available, always use it. *Then* see if Journal BodyName matches that, and if so set BodyID. Close-orbiting bodies might therefore cause BodyName to be set without BodyID, but then it's up to EDDN listeners to make a decision, rather than making it for them. --- plugins/eddn.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 1225cd59..a7afd2a9 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -804,15 +804,13 @@ Msg:\n{msg}''' entry = ret - # Body Name and ID, if available - # Status.json BodyName is set as soon as the Orbital Cruise/Glide HUD - # activates. - # Journal ApproachBody only occurs once inside Orbital Cruise altitude. - # So we check that both are set, and match, then use the Status.json - # value. - if this.status_body_name is not None and this.status_body_name == this.body_name: + # Set BodyName if it's available from Status.json + if this.status_body_name is not None: entry['BodyName'] = this.status_body_name - entry['BodyID'] = this.body_id + # Only set BodyID if journal BodyName matches the Status.json one. + # This avoids binary body issues. + if this.status_body_name == this.body_name: + entry['BodyID'] = this.body_id ####################################################################### msg = { From 86d4369e0f8177ab1abef9663dd034a1672f086a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 17:03:09 +0000 Subject: [PATCH 141/527] build(deps-dev): bump flake8-isort from 4.0.0 to 4.1.1 Bumps [flake8-isort](https://github.com/gforcada/flake8-isort) from 4.0.0 to 4.1.1. - [Release notes](https://github.com/gforcada/flake8-isort/releases) - [Changelog](https://github.com/gforcada/flake8-isort/blob/master/CHANGES.rst) - [Commits](https://github.com/gforcada/flake8-isort/compare/4.0.0...4.1.1) --- updated-dependencies: - dependency-name: flake8-isort dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 714a1246..8a2d252c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,7 +9,7 @@ flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 flake8-docstrings==1.6.0 isort==5.9.3 -flake8-isort==4.0.0 +flake8-isort==4.1.1 flake8-json==21.7.0 flake8-noqa==1.2.0 flake8-polyfill==1.0.2 From 214032e8e70182c97fd630924fb2411a583ba00b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 17:07:24 +0000 Subject: [PATCH 142/527] build(deps-dev): bump flake8 from 3.9.2 to 4.0.1 Bumps [flake8](https://github.com/pycqa/flake8) from 3.9.2 to 4.0.1. - [Release notes](https://github.com/pycqa/flake8/releases) - [Commits](https://github.com/pycqa/flake8/compare/3.9.2...4.0.1) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8a2d252c..b59f0999 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ wheel # Static analysis tools -flake8==3.9.2 +flake8==4.0.1 flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 From 8ecb01c5ae8649c2cca13564a29996b42e73d417 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 14 Oct 2021 18:13:21 +0100 Subject: [PATCH 143/527] Revert "build(deps-dev): bump flake8 from 3.9.2 to 4.0.1" This reverts commit 214032e8e70182c97fd630924fb2411a583ba00b. flake8-use-fstring has `flake8==3.*` --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b59f0999..8a2d252c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ wheel # Static analysis tools -flake8==4.0.1 +flake8==3.9.2 flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 From 42594c93661956ebced19418dc70132f03b79f7b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 15 Oct 2021 11:57:09 +0100 Subject: [PATCH 144/527] EDDN: Abbreviate tracking_ui_update() code --- plugins/eddn.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index a7afd2a9..e6aa9431 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -996,19 +996,16 @@ def plugin_app(parent: tk.Tk) -> Optional[tk.Frame]: def tracking_ui_update() -> None: """Update the Tracking UI with current data.""" - if this.body_name is None: - this.ui_j_body_name['text'] = '≪None≫' - else: + this.ui_j_body_name['text'] = '≪None≫' + if this.body_name is not None: this.ui_j_body_name['text'] = this.body_name - if this.body_id is None: - this.ui_j_body_id['text'] = '≪None≫' - else: + this.ui_j_body_id['text'] = '≪None≫' + if this.body_id is not None: this.ui_j_body_id['text'] = str(this.body_id) - if this.status_body_name is None: - this.ui_s_body_name['text'] = '≪None≫' - else: + this.ui_s_body_name['text'] = '≪None≫' + if this.status_body_name is not None: this.ui_s_body_name['text'] = this.status_body_name this.ui.update_idletasks() From 92054f4e1514fd4b4dfdd56c92419f15e8ad6c4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 17:03:12 +0000 Subject: [PATCH 145/527] build(deps): bump actions/checkout from 2.3.4 to 2.3.5 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.3.5) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 318ff80f..03dc1744 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -28,7 +28,7 @@ jobs: # based on. - name: Checkout head commits # https://github.com/actions/checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 #with: #ref: ${{github.head.sha}} #repository: ${{github.event.pull_request.head.repo.full_name}} diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 8438a9a2..8c7f54b3 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.3.5 with: fetch-depth: 0 - name: Set up Python 3.9 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index eac27cf4..06c1c027 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -16,7 +16,7 @@ jobs: shell: powershell steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.3.5 - uses: actions/setup-python@v2.2.2 with: python-version: "3.9.7" From 65122ea3e7830159b44af4927eadd970bc842ca8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 17:03:20 +0000 Subject: [PATCH 146/527] build(deps-dev): bump types-requests from 2.25.10 to 2.25.11 Bumps [types-requests](https://github.com/python/typeshed) from 2.25.10 to 2.25.11. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8a2d252c..152c5507 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.1 mypy==0.910 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.25.10 +types-requests==2.25.11 # Code formatting tools autopep8==1.5.7 From 1f7b0b7c0d42c09a4c64384ac4520b897f75934b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 14:02:10 +0100 Subject: [PATCH 147/527] companion.py: Fix isort order complaint --- companion.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/companion.py b/companion.py index 16839925..1a811858 100644 --- a/companion.py +++ b/companion.py @@ -29,12 +29,11 @@ from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, OrderedDic import requests import config as conf_module +import protocol from config import appname, appversion, config from edmc_data import companion_category_map as category_map from EDMCLogging import get_main_logger from monitor import monitor -# from protocol import protocolhandler -import protocol logger = get_main_logger() From 62b5e4e7eb3491a9e5b5095d22f8e322c25e2bd0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 14:03:07 +0100 Subject: [PATCH 148/527] EDMarketConnector.py: Fix isort order complaint --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index b092c442..4c480f47 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -376,6 +376,7 @@ from tkinter import ttk import commodity import plug import prefs +import protocol import stats import td from commodity import COMMODITY_CSV @@ -384,7 +385,6 @@ from edmc_data import ship_name_map from hotkey import hotkeymgr from l10n import Translations from monitor import monitor -import protocol from theme import theme from ttkHyperlinkLabel import HyperlinkLabel From fc34d023b6db4255504d16e7d4317caccb695003 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 14:10:30 +0100 Subject: [PATCH 149/527] EDDN: tracking_ui_update(): check if this UI bit actually active --- plugins/eddn.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index e6aa9431..841cbead 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -995,7 +995,10 @@ def plugin_app(parent: tk.Tk) -> Optional[tk.Frame]: def tracking_ui_update() -> None: - """Update the Tracking UI with current data.""" + """Update the Tracking UI with current data, if required.""" + if not config.eddn_tracking_ui: + return + this.ui_j_body_name['text'] = '≪None≫' if this.body_name is not None: this.ui_j_body_name['text'] = this.body_name From 5ae953bf4559d86541e20fe3bd882eee15cfaae5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 14:24:23 +0100 Subject: [PATCH 150/527] EDDN: Drop messages if EDDN says it doesn't know the schema Currently Live EDDN doesn't yet have the new schemas such as navroute, so will complain. Rather than leaving such messages in our EDDN replay queue and getting an error every time that is run, detect this error case and drop the messages. --- plugins/eddn.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 841cbead..9a783936 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -106,6 +106,11 @@ class EDDN: TIMEOUT = 10 # requests timeout MODULE_RE = re.compile(r'^Hpt_|^Int_|Armour_', re.IGNORECASE) CANONICALISE_RE = re.compile(r'\$(.+)_name;') + UNKNOWN_SCHEMA_RE = re.compile( + r"^FAIL: \[JsonValidationException\('Schema " + r"https://eddn.edcd.io/schemas/(?P.+)/(?P[0-9]+) is unknown, " + r"unable to validate.',\)\]$" + ) def __init__(self, parent: tk.Tk): self.parent: tk.Tk = parent @@ -210,6 +215,11 @@ class EDDN: logger.trace_if('plugin.eddn', "EDDN is still objecting to empty commodities data") return # We want to silence warnings otherwise + if unknown_schema := self.UNKNOWN_SCHEMA_RE.match(r.text): + logger.warning(f"EDDN doesn't (yet?) know about schema: {unknown_schema['schema_name']}" + f"/{unknown_schema['schema_version']}") + return # Pretend it went OK so this message isn't retried + logger.debug( f'''Status from POST wasn't OK: Status\t{r.status_code} From 7fa0576c85763205cd9be5f3ec873d06ff8cc1cf Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 14:41:25 +0100 Subject: [PATCH 151/527] EDDN: Keep 'unknown schema' messages in replaylog This still logs them, at DEBUG, which will get spammy as such messages accumulate. Uncommenting the: `# return # Pretend it went OK so this message isn't retried` at line 291 in EDDN.sendreplay(), in the: `except requests.exceptions.HTTPError as e:` block would cause them to not stay in the replaylog. --- plugins/eddn.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 9a783936..66956c48 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -215,19 +215,15 @@ class EDDN: logger.trace_if('plugin.eddn', "EDDN is still objecting to empty commodities data") return # We want to silence warnings otherwise - if unknown_schema := self.UNKNOWN_SCHEMA_RE.match(r.text): - logger.warning(f"EDDN doesn't (yet?) know about schema: {unknown_schema['schema_name']}" - f"/{unknown_schema['schema_version']}") - return # Pretend it went OK so this message isn't retried - - logger.debug( - f'''Status from POST wasn't OK: + if not self.UNKNOWN_SCHEMA_RE.match(r.text): + logger.debug( + f'''Status from POST wasn't OK: Status\t{r.status_code} URL\t{r.url} Headers\t{r.headers} Content:\n{r.text} Msg:\n{msg}''' - ) + ) r.raise_for_status() @@ -289,7 +285,13 @@ Msg:\n{msg}''' # in question out of replaylog, else we'll keep retrying a bad message # forever. except requests.exceptions.HTTPError as e: - status['text'] = self.http_error_to_log(e) + if unknown_schema := self.UNKNOWN_SCHEMA_RE.match(e.response.text): + logger.debug(f"EDDN doesn't (yet?) know about schema: {unknown_schema['schema_name']}" + f"/{unknown_schema['schema_version']}") + # return # Pretend it went OK so this message isn't retried + + else: + status['text'] = self.http_error_to_log(e) except requests.exceptions.RequestException as e: logger.debug('Failed sending', exc_info=e) From aecf37513880ea7736e1c001226355f44067b990 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 14:55:43 +0100 Subject: [PATCH 152/527] EDDN: Record `horizons` flag in journal_entry() So that we can then first check *this* in `is_horizons()`. --- plugins/eddn.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index e6aa9431..2b42ac3d 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -46,6 +46,8 @@ class This: # Track if we're on foot self.on_foot = False + # Horizons ? + self.horizons = False # Running under Odyssey? self.odyssey = False @@ -1165,8 +1167,9 @@ def journal_entry( # noqa: C901, CCR001 this.on_foot = state['OnFoot'] - # Note if we're under Odyssey - # The only event this is already in is `LoadGame` which isn't sent to EDDN. + # Note if we're under Horizons and/or Odyssey + # The only event these are already in is `LoadGame` which isn't sent to EDDN. + this.horizons = entry['horizons'] = state['Horizons'] this.odyssey = entry['odyssey'] = state['Odyssey'] # Track location From ca80edd34d88298a2c9d933f79f0da8e68d870eb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 15:01:51 +0100 Subject: [PATCH 153/527] EDDN: If `this.horizons` is true, use that in `is_horizons()` check --- plugins/eddn.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 2b42ac3d..497bb4f6 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1395,6 +1395,22 @@ def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY :param ships: Ships available at the docked station. :return: bool - True if the Cmdr has Horizons access. """ + # First check the Journal-sourced flag + # NB: This assumes game currently running, rather than "old + # journal file". `LoadGame` determines monitor.cmdr, which determines + # the account used for CAPI, so it *should* match. + # + # For this to be wrong, the user would have had to have, e.g.: + # + # 1. Logged into Cmdr in Horizons/Odyssey, then back out again. + # 2. Logged into Cmdr in base game, either on another machine, or + # have removed the Journal file after. + # 3. Re-run EDMC and triggered a manual CAPI update. + # + # This seems unlikely. + if this.horizons: + return True + economies_colony = False modules_horizons = False ship_horizons = False From bd183efbd4dfa8365246952f04352403195102aa Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 15:41:15 +0100 Subject: [PATCH 154/527] EDDN: Just use `this.horizons` for CAPI data sending --- plugins/eddn.py | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 90f9d505..78932c45 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -442,14 +442,6 @@ Msg:\n{msg}''' """ modules, ships = self.safe_modules_and_ships(data) - # Horizons flag - will hit at least Int_PlanetApproachSuite other than at engineer bases ("Colony"), - # prison or rescue Megaships, or under Pirate Attack etc - horizons: bool = is_horizons( - data['lastStarport'].get('economies', {}), - modules, - ships - ) - to_search: Iterator[Mapping[str, Any]] = filter( lambda m: self.MODULE_RE.search(m['name']) and m.get('sku') in (None, HORIZ_SKU) and m['name'] != 'Int_PlanetApproachSuite', @@ -461,7 +453,7 @@ Msg:\n{msg}''' ) # Don't send empty modules list - schema won't allow it - if outfitting and this.outfitting != (horizons, outfitting): + if outfitting and this.outfitting != (this.horizons, outfitting): self.send(data['commander']['name'], { '$schemaRef': f'https://eddn.edcd.io/schemas/outfitting/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -469,13 +461,13 @@ Msg:\n{msg}''' ('systemName', data['lastSystem']['name']), ('stationName', data['lastStarport']['name']), ('marketId', data['lastStarport']['id']), - ('horizons', horizons), + ('horizons', this.horizons), ('modules', outfitting), ('odyssey', is_odyssey), ]), }) - this.outfitting = (horizons, outfitting) + this.outfitting = (this.horizons, outfitting) def export_shipyard(self, data: CAPIData, is_beta: bool, is_odyssey: bool) -> None: """ @@ -488,12 +480,6 @@ Msg:\n{msg}''' """ modules, ships = self.safe_modules_and_ships(data) - horizons: bool = is_horizons( - data['lastStarport'].get('economies', {}), - modules, - ships - ) - shipyard: List[Mapping[str, Any]] = sorted( itertools.chain( (ship['name'].lower() for ship in (ships['shipyard_list'] or {}).values()), @@ -501,7 +487,7 @@ Msg:\n{msg}''' ) ) # Don't send empty ships list - shipyard data is only guaranteed present if user has visited the shipyard. - if shipyard and this.shipyard != (horizons, shipyard): + if shipyard and this.shipyard != (this.horizons, shipyard): self.send(data['commander']['name'], { '$schemaRef': f'https://eddn.edcd.io/schemas/shipyard/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -509,13 +495,13 @@ Msg:\n{msg}''' ('systemName', data['lastSystem']['name']), ('stationName', data['lastStarport']['name']), ('marketId', data['lastStarport']['id']), - ('horizons', horizons), + ('horizons', this.horizons), ('ships', shipyard), ('odyssey', is_odyssey), ]), }) - this.shipyard = (horizons, shipyard) + this.shipyard = (this.horizons, shipyard) def export_journal_commodities(self, cmdr: str, is_beta: bool, entry: Mapping[str, Any]) -> None: """ @@ -571,7 +557,6 @@ Msg:\n{msg}''' :param entry: The relevant journal entry """ modules: List[Mapping[str, Any]] = entry.get('Items', []) - horizons: bool = entry.get('Horizons', False) # outfitting = sorted([self.MODULE_RE.sub(lambda m: m.group(0).capitalize(), module['Name']) # for module in modules if module['Name'] != 'int_planetapproachsuite']) outfitting: List[str] = sorted( @@ -579,7 +564,7 @@ Msg:\n{msg}''' filter(lambda m: m['Name'] != 'int_planetapproachsuite', modules) ) # Don't send empty modules list - schema won't allow it - if outfitting and this.outfitting != (horizons, outfitting): + if outfitting and this.outfitting != (this.horizons, outfitting): self.send(cmdr, { '$schemaRef': f'https://eddn.edcd.io/schemas/outfitting/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -587,13 +572,13 @@ Msg:\n{msg}''' ('systemName', entry['StarSystem']), ('stationName', entry['StationName']), ('marketId', entry['MarketID']), - ('horizons', horizons), + ('horizons', this.horizons), ('modules', outfitting), ('odyssey', entry['odyssey']) ]), }) - this.outfitting = (horizons, outfitting) + this.outfitting = (this.horizons, outfitting) def export_journal_shipyard(self, cmdr: str, is_beta: bool, entry: Mapping[str, Any]) -> None: """ @@ -606,10 +591,9 @@ Msg:\n{msg}''' :param entry: the relevant journal entry """ ships: List[Mapping[str, Any]] = entry.get('PriceList') or [] - horizons: bool = entry.get('Horizons', False) shipyard = sorted(ship['ShipType'] for ship in ships) # Don't send empty ships list - shipyard data is only guaranteed present if user has visited the shipyard. - if shipyard and this.shipyard != (horizons, shipyard): + if shipyard and this.shipyard != (this.horizons, shipyard): self.send(cmdr, { '$schemaRef': f'https://eddn.edcd.io/schemas/shipyard/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -617,13 +601,13 @@ Msg:\n{msg}''' ('systemName', entry['StarSystem']), ('stationName', entry['StationName']), ('marketId', entry['MarketID']), - ('horizons', horizons), + ('horizons', this.horizons), ('ships', shipyard), ('odyssey', entry['odyssey']) ]), }) - # this.shipyard = (horizons, shipyard) + # this.shipyard = (this.horizons, shipyard) def export_journal_entry(self, cmdr: str, entry: Mapping[str, Any], msg: Mapping[str, Any]) -> None: """ From 556ace5306bebbcf34c1a56a9023a822218a73f1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 15:47:12 +0100 Subject: [PATCH 155/527] EDDN: Use `this.odyssey` rather than passing to functions --- plugins/eddn.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 78932c45..11d5100d 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -329,7 +329,7 @@ Msg:\n{msg}''' # LANG: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number return _('EDDN Error: Returned {STATUS} status code').format(status_code) - def export_commodities(self, data: Mapping[str, Any], is_beta: bool, is_odyssey: bool) -> None: # noqa: CCR001 + def export_commodities(self, data: Mapping[str, Any], is_beta: bool) -> None: # noqa: CCR001 """ Update EDDN with the commodities on the current (lastStarport) station. @@ -337,7 +337,6 @@ Msg:\n{msg}''' :param data: a dict containing the starport data :param is_beta: whether or not we're currently in beta mode - :param is_odyssey: whether the account shows as having Odyssey expansion. """ commodities: List[OrderedDictT[str, Any]] = [] for commodity in data['lastStarport'].get('commodities') or []: @@ -373,7 +372,7 @@ Msg:\n{msg}''' ('stationName', data['lastStarport']['name']), ('marketId', data['lastStarport']['id']), ('commodities', commodities), - ('odyssey', is_odyssey), + ('odyssey', this.odyssey), ]) if 'economies' in data['lastStarport']: @@ -431,7 +430,7 @@ Msg:\n{msg}''' return modules, ships - def export_outfitting(self, data: CAPIData, is_beta: bool, is_odyssey: bool) -> None: + def export_outfitting(self, data: CAPIData, is_beta: bool) -> None: """ Update EDDN with the current (lastStarport) station's outfitting options, if any. @@ -463,13 +462,13 @@ Msg:\n{msg}''' ('marketId', data['lastStarport']['id']), ('horizons', this.horizons), ('modules', outfitting), - ('odyssey', is_odyssey), + ('odyssey', this.odyssey), ]), }) this.outfitting = (this.horizons, outfitting) - def export_shipyard(self, data: CAPIData, is_beta: bool, is_odyssey: bool) -> None: + def export_shipyard(self, data: CAPIData, is_beta: bool) -> None: """ Update EDDN with the current (lastStarport) station's outfitting options, if any. @@ -497,7 +496,7 @@ Msg:\n{msg}''' ('marketId', data['lastStarport']['id']), ('horizons', this.horizons), ('ships', shipyard), - ('odyssey', is_odyssey), + ('odyssey', this.odyssey), ]), }) @@ -1364,9 +1363,9 @@ def cmdr_data(data: CAPIData, is_beta: bool) -> Optional[str]: # noqa: CCR001 status['text'] = _('Sending data to EDDN...') # LANG: Status text shown while attempting to send data status.update_idletasks() - this.eddn.export_commodities(data, is_beta, this.odyssey) - this.eddn.export_outfitting(data, is_beta, this.odyssey) - this.eddn.export_shipyard(data, is_beta, this.odyssey) + this.eddn.export_commodities(data, is_beta) + this.eddn.export_outfitting(data, is_beta) + this.eddn.export_shipyard(data, is_beta) if not old_status: status['text'] = '' status.update_idletasks() From a32546b00163c6948f43a2478905b79a906efa73 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 16:14:35 +0100 Subject: [PATCH 156/527] EDDN: Set `horizons` on `commodity/3` messages as per schema --- plugins/eddn.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 11d5100d..2ae0fac0 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -372,6 +372,7 @@ Msg:\n{msg}''' ('stationName', data['lastStarport']['name']), ('marketId', data['lastStarport']['id']), ('commodities', commodities), + ('horizons', this.horizons), ('odyssey', this.odyssey), ]) From b3419ec548fff8a97a2c5284cc5198684ca06259 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 16:17:58 +0100 Subject: [PATCH 157/527] EDDN: Also set `commodity/3`->`horizons` for journal-sourced data --- plugins/eddn.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 2ae0fac0..4f20aef0 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -540,7 +540,8 @@ Msg:\n{msg}''' ('stationName', entry['StationName']), ('marketId', entry['MarketID']), ('commodities', commodities), - ('odyssey', entry['odyssey']) + ('horizons', this.horizons), + ('odyssey', this.odyssey), ]), }) From 4fef4257bd00376f45e94a35db925c0fbb58b267 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 16:20:46 +0100 Subject: [PATCH 158/527] EDDN: use this.odyssey for Journal outfitting and shipyard For consistency with the horizons flag. They *are* placed *from* the `this` versions into `entry`, but we might as well go the direct route. They have to be set explicitly here as we process the `entry` to make a wholly new `message` rather than the `message` just being `entry` with some changes. --- plugins/eddn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 4f20aef0..8c5ed1d9 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -575,7 +575,7 @@ Msg:\n{msg}''' ('marketId', entry['MarketID']), ('horizons', this.horizons), ('modules', outfitting), - ('odyssey', entry['odyssey']) + ('odyssey', this.odyssey), ]), }) @@ -604,7 +604,7 @@ Msg:\n{msg}''' ('marketId', entry['MarketID']), ('horizons', this.horizons), ('ships', shipyard), - ('odyssey', entry['odyssey']) + ('odyssey', this.odyssey), ]), }) From 29b69745f3a8f2dc9e54d88f6dd889eb7c90fcd1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 16:32:38 +0100 Subject: [PATCH 159/527] EDDN: document that some EDDN messages aren't retried --- plugins/eddn.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 8c5ed1d9..c2163509 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -335,6 +335,10 @@ Msg:\n{msg}''' Once the send is complete, this.commodities is updated with the new data. + NB: This does *not* go through the replaylog, unlike most of the + Journal-sourced data. This kind of timely data is often rejected by + listeners if 'too old' anyway, so little point. + :param data: a dict containing the starport data :param is_beta: whether or not we're currently in beta mode """ @@ -437,6 +441,10 @@ Msg:\n{msg}''' Once the send is complete, this.outfitting is updated with the given data. + NB: This does *not* go through the replaylog, unlike most of the + Journal-sourced data. This kind of timely data is often rejected by + listeners if 'too old' anyway, so little point. + :param data: dict containing the outfitting data :param is_beta: whether or not we're currently in beta mode """ @@ -475,6 +483,10 @@ Msg:\n{msg}''' Once the send is complete, this.shipyard is updated to the new data. + NB: This does *not* go through the replaylog, unlike most of the + Journal-sourced data. This kind of timely data is often rejected by + listeners if 'too old' anyway, so little point. + :param data: dict containing the shipyard data :param is_beta: whether or not we are in beta mode """ @@ -509,6 +521,10 @@ Msg:\n{msg}''' As a side effect, it also updates this.commodities with the data. + NB: This does *not* go through the replaylog, unlike most of the + Journal-sourced data. This kind of timely data is often rejected by + listeners if 'too old' anyway, so little point. + :param cmdr: The commander to send data under :param is_beta: whether or not we're in beta mode :param entry: the journal entry containing the commodities data @@ -553,6 +569,10 @@ Msg:\n{msg}''' As a side effect, it also updates this.outfitting with the data. + NB: This does *not* go through the replaylog, unlike most of the + Journal-sourced data. This kind of timely data is often rejected by + listeners if 'too old' anyway, so little point. + :param cmdr: The commander to send data under :param is_beta: Whether or not we're in beta mode :param entry: The relevant journal entry @@ -587,6 +607,10 @@ Msg:\n{msg}''' As a side effect, this.shipyard is updated with the data. + NB: This does *not* go through the replaylog, unlike most of the + Journal-sourced data. This kind of timely data is often rejected by + listeners if 'too old' anyway, so little point. + :param cmdr: the commander to send this update under :param is_beta: Whether or not we're in beta mode :param entry: the relevant journal entry @@ -614,7 +638,8 @@ Msg:\n{msg}''' """ Update EDDN with an event from the journal. - Additionally if additional lines are cached, it may send those as well. + Additionally if other lines have been saved for retry, it may send + those as well. :param cmdr: Commander name as passed in through `journal_entry()`. :param entry: The full journal event dictionary (due to checks in this function). From 98f215e6ade7cf14766467cd2cbd3466d86689b1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 17 Oct 2021 16:46:11 +0100 Subject: [PATCH 160/527] EDDN: Remove `horizons` flag from navroute messages As with `odyssey` this isn't currently in the not-yet-live schema. --- plugins/eddn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index c2163509..07071a32 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -929,9 +929,14 @@ Msg:\n{msg}''' ####################################################################### # Elisions ####################################################################### - # WORKAROUND WIP EDDN schema | 2021-09-27: This will reject with the Odyssey flag present + # WORKAROUND WIP EDDN schema | 2021-10-17: This will reject with the Odyssey or Horizons flags present if 'odyssey' in entry: del entry['odyssey'] + + if 'horizons' in entry: + del entry['horizons'] + + # END WORKAROUND ####################################################################### ####################################################################### From e14819797158ddced315aa3456fc491d5a695763 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 12:08:32 +0100 Subject: [PATCH 161/527] Revert "EDDN: use this.odyssey for Journal outfitting and shipyard" This reverts commit 4fef4257bd00376f45e94a35db925c0fbb58b267. --- plugins/eddn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 07071a32..70657136 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -595,7 +595,7 @@ Msg:\n{msg}''' ('marketId', entry['MarketID']), ('horizons', this.horizons), ('modules', outfitting), - ('odyssey', this.odyssey), + ('odyssey', entry['odyssey']) ]), }) @@ -628,7 +628,7 @@ Msg:\n{msg}''' ('marketId', entry['MarketID']), ('horizons', this.horizons), ('ships', shipyard), - ('odyssey', this.odyssey), + ('odyssey', entry['odyssey']) ]), }) From 90aa2698cdb62c794b372b600c457288f8c1416b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 12:09:55 +0100 Subject: [PATCH 162/527] Revert "EDDN: Just use `this.horizons` for CAPI data sending" This reverts commit bd183efbd4dfa8365246952f04352403195102aa. --- plugins/eddn.py | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 70657136..751e1085 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -450,6 +450,14 @@ Msg:\n{msg}''' """ modules, ships = self.safe_modules_and_ships(data) + # Horizons flag - will hit at least Int_PlanetApproachSuite other than at engineer bases ("Colony"), + # prison or rescue Megaships, or under Pirate Attack etc + horizons: bool = is_horizons( + data['lastStarport'].get('economies', {}), + modules, + ships + ) + to_search: Iterator[Mapping[str, Any]] = filter( lambda m: self.MODULE_RE.search(m['name']) and m.get('sku') in (None, HORIZ_SKU) and m['name'] != 'Int_PlanetApproachSuite', @@ -461,7 +469,7 @@ Msg:\n{msg}''' ) # Don't send empty modules list - schema won't allow it - if outfitting and this.outfitting != (this.horizons, outfitting): + if outfitting and this.outfitting != (horizons, outfitting): self.send(data['commander']['name'], { '$schemaRef': f'https://eddn.edcd.io/schemas/outfitting/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -469,13 +477,13 @@ Msg:\n{msg}''' ('systemName', data['lastSystem']['name']), ('stationName', data['lastStarport']['name']), ('marketId', data['lastStarport']['id']), - ('horizons', this.horizons), + ('horizons', horizons), ('modules', outfitting), ('odyssey', this.odyssey), ]), }) - this.outfitting = (this.horizons, outfitting) + this.outfitting = (horizons, outfitting) def export_shipyard(self, data: CAPIData, is_beta: bool) -> None: """ @@ -492,6 +500,12 @@ Msg:\n{msg}''' """ modules, ships = self.safe_modules_and_ships(data) + horizons: bool = is_horizons( + data['lastStarport'].get('economies', {}), + modules, + ships + ) + shipyard: List[Mapping[str, Any]] = sorted( itertools.chain( (ship['name'].lower() for ship in (ships['shipyard_list'] or {}).values()), @@ -499,7 +513,7 @@ Msg:\n{msg}''' ) ) # Don't send empty ships list - shipyard data is only guaranteed present if user has visited the shipyard. - if shipyard and this.shipyard != (this.horizons, shipyard): + if shipyard and this.shipyard != (horizons, shipyard): self.send(data['commander']['name'], { '$schemaRef': f'https://eddn.edcd.io/schemas/shipyard/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -507,13 +521,13 @@ Msg:\n{msg}''' ('systemName', data['lastSystem']['name']), ('stationName', data['lastStarport']['name']), ('marketId', data['lastStarport']['id']), - ('horizons', this.horizons), + ('horizons', horizons), ('ships', shipyard), ('odyssey', this.odyssey), ]), }) - this.shipyard = (this.horizons, shipyard) + this.shipyard = (horizons, shipyard) def export_journal_commodities(self, cmdr: str, is_beta: bool, entry: Mapping[str, Any]) -> None: """ @@ -578,6 +592,7 @@ Msg:\n{msg}''' :param entry: The relevant journal entry """ modules: List[Mapping[str, Any]] = entry.get('Items', []) + horizons: bool = entry.get('Horizons', False) # outfitting = sorted([self.MODULE_RE.sub(lambda m: m.group(0).capitalize(), module['Name']) # for module in modules if module['Name'] != 'int_planetapproachsuite']) outfitting: List[str] = sorted( @@ -585,7 +600,7 @@ Msg:\n{msg}''' filter(lambda m: m['Name'] != 'int_planetapproachsuite', modules) ) # Don't send empty modules list - schema won't allow it - if outfitting and this.outfitting != (this.horizons, outfitting): + if outfitting and this.outfitting != (horizons, outfitting): self.send(cmdr, { '$schemaRef': f'https://eddn.edcd.io/schemas/outfitting/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -593,13 +608,13 @@ Msg:\n{msg}''' ('systemName', entry['StarSystem']), ('stationName', entry['StationName']), ('marketId', entry['MarketID']), - ('horizons', this.horizons), + ('horizons', horizons), ('modules', outfitting), ('odyssey', entry['odyssey']) ]), }) - this.outfitting = (this.horizons, outfitting) + this.outfitting = (horizons, outfitting) def export_journal_shipyard(self, cmdr: str, is_beta: bool, entry: Mapping[str, Any]) -> None: """ @@ -616,9 +631,10 @@ Msg:\n{msg}''' :param entry: the relevant journal entry """ ships: List[Mapping[str, Any]] = entry.get('PriceList') or [] + horizons: bool = entry.get('Horizons', False) shipyard = sorted(ship['ShipType'] for ship in ships) # Don't send empty ships list - shipyard data is only guaranteed present if user has visited the shipyard. - if shipyard and this.shipyard != (this.horizons, shipyard): + if shipyard and this.shipyard != (horizons, shipyard): self.send(cmdr, { '$schemaRef': f'https://eddn.edcd.io/schemas/shipyard/2{"/test" if is_beta else ""}', 'message': OrderedDict([ @@ -626,13 +642,13 @@ Msg:\n{msg}''' ('systemName', entry['StarSystem']), ('stationName', entry['StationName']), ('marketId', entry['MarketID']), - ('horizons', this.horizons), + ('horizons', horizons), ('ships', shipyard), ('odyssey', entry['odyssey']) ]), }) - # this.shipyard = (this.horizons, shipyard) + # this.shipyard = (horizons, shipyard) def export_journal_entry(self, cmdr: str, entry: Mapping[str, Any], msg: Mapping[str, Any]) -> None: """ From d8689e5b9b1f81178706777d4faa354b310629b2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 12:10:09 +0100 Subject: [PATCH 163/527] Revert "EDDN: If `this.horizons` is true, use that in `is_horizons()` check" This reverts commit ca80edd34d88298a2c9d933f79f0da8e68d870eb. --- plugins/eddn.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 751e1085..6768d023 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1441,22 +1441,6 @@ def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY :param ships: Ships available at the docked station. :return: bool - True if the Cmdr has Horizons access. """ - # First check the Journal-sourced flag - # NB: This assumes game currently running, rather than "old - # journal file". `LoadGame` determines monitor.cmdr, which determines - # the account used for CAPI, so it *should* match. - # - # For this to be wrong, the user would have had to have, e.g.: - # - # 1. Logged into Cmdr in Horizons/Odyssey, then back out again. - # 2. Logged into Cmdr in base game, either on another machine, or - # have removed the Journal file after. - # 3. Re-run EDMC and triggered a manual CAPI update. - # - # This seems unlikely. - if this.horizons: - return True - economies_colony = False modules_horizons = False ship_horizons = False From 694321064d439a983ba08087b0b78d7951943686 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 12:20:06 +0100 Subject: [PATCH 164/527] EDDN: Rename is_horizons() and document that it's for CAPI data only OK, it has `data` passed in, so this should be obvious, but let's make it explicit both by name and in the docstring. The docstring now also emphasies that *this* check **MUST** be used for CAPI data, as it's dependent only on the availability of Horizons on the account, and not on the `LoadGame` flags. --- plugins/eddn.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 6768d023..31ab721c 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -452,7 +452,7 @@ Msg:\n{msg}''' # Horizons flag - will hit at least Int_PlanetApproachSuite other than at engineer bases ("Colony"), # prison or rescue Megaships, or under Pirate Attack etc - horizons: bool = is_horizons( + horizons: bool = capi_is_horizons( data['lastStarport'].get('economies', {}), modules, ships @@ -500,7 +500,7 @@ Msg:\n{msg}''' """ modules, ships = self.safe_modules_and_ships(data) - horizons: bool = is_horizons( + horizons: bool = capi_is_horizons( data['lastStarport'].get('economies', {}), modules, ships @@ -1432,10 +1432,19 @@ def cmdr_data(data: CAPIData, is_beta: bool) -> Optional[str]: # noqa: CCR001 MAP_STR_ANY = Mapping[str, Any] -def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY) -> bool: +def capi_is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY) -> bool: """ Indicate if the supplied data indicates a player has Horizons access. + This is to be used **only** for CAPI-sourced data and **MUST** be used + for CAPI data!!! + + If the account has Horizons access then CAPI `/shipyard` will always see + the Horizons-only modules/ships. You can**NOT** use the Journal horizons + flag for this! If logged in to the base game on an account with Horizons, + which is all of them now, CAPI `/shipyard` will *still* return all of the + Horizons-only modules and ships. + :param economies: Economies of where the Cmdr is docked. :param modules: Modules available at the docked station. :param ships: Ships available at the docked station. From c97b539ac3a1e96bb3a7591aa02f8a484e51e88a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 12:25:35 +0100 Subject: [PATCH 165/527] EDDN: Revert to using capi_is_horizons() in export_commodities() --- plugins/eddn.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 31ab721c..71a93112 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -342,6 +342,12 @@ Msg:\n{msg}''' :param data: a dict containing the starport data :param is_beta: whether or not we're currently in beta mode """ + modules, ships = self.safe_modules_and_ships(data) + horizons: bool = capi_is_horizons( + data['lastStarport'].get('economies', {}), + modules, + ships + ) commodities: List[OrderedDictT[str, Any]] = [] for commodity in data['lastStarport'].get('commodities') or []: # Check 'marketable' and 'not prohibited' @@ -376,7 +382,7 @@ Msg:\n{msg}''' ('stationName', data['lastStarport']['name']), ('marketId', data['lastStarport']['id']), ('commodities', commodities), - ('horizons', this.horizons), + ('horizons', horizons), ('odyssey', this.odyssey), ]) From cf5806021ec8ccbcf2d9274797b9dd8ee5c343ba Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 12:33:11 +0100 Subject: [PATCH 166/527] PLUGINS.md: capi_is_horizons() now --- PLUGINS.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/PLUGINS.md b/PLUGINS.md index e8a27474..8a27efff 100644 --- a/PLUGINS.md +++ b/PLUGINS.md @@ -659,13 +659,12 @@ New in version 5.0.1: `Odyssey` boolean based on the presence of such a flag in the `LoadGame` event. Defaults to `False`, i.e. if no such key in the event. -The previously undocumented`Horizons` boolean is similarly from `LoadGame`, -but blindly retrieves the value rather than having a strict default. There's +The previously undocumented `Horizons` boolean is similarly from `LoadGame`, +but blindly retrieves the value rather than having a strict default. There'd be an exception if it wasn't there, and the value would be `None`. Note that this is **NOT** the same as the return from -[plugins/eddn.py:is_horizons()](./plugins/eddn.py). That function is necessary -because CAPI data doesn't (didn't always?) have an indication of Horizons or -not. +[plugins/eddn.py:capi_is_horizons()](./plugins/eddn.py). That function is +necessary because CAPI data doesn't have a simple indication of Horizons-ness. New in version 5.0.3: From 7dcb275e9b390108ca2aa038430fe96cb9b21759 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 14:18:11 +0100 Subject: [PATCH 167/527] EDDN: Document HORIZONS_SKU, and to NOT use the others --- plugins/eddn.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 71a93112..7e72aa0f 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -91,7 +91,15 @@ class This: this = This() -HORIZ_SKU = 'ELITE_HORIZONS_V_PLANETARY_LANDINGS' +# This SKU is tagged on any module or ship that you must have Horizons for. +HORIZONS_SKU = 'ELITE_HORIZONS_V_PLANETARY_LANDINGS' +# ELITE_HORIZONS_V_COBRA_MK_IV_1000` is for the Cobra Mk IV, but +# is also available in the base game, if you have entitlement. +# `ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER` is for the Guardian FSD Boosters, +# which you need Horizons in order to unlock, but could be on sale even in the +# base game due to entitlement. +# Thus do **NOT** use either of these in addition to the PLANETARY_LANDINGS +# one. # TODO: a good few of these methods are static or could be classmethods. they should be created as such. @@ -465,8 +473,8 @@ Msg:\n{msg}''' ) to_search: Iterator[Mapping[str, Any]] = filter( - lambda m: self.MODULE_RE.search(m['name']) and m.get('sku') in (None, HORIZ_SKU) and - m['name'] != 'Int_PlanetApproachSuite', + lambda m: self.MODULE_RE.search(m['name']) and m.get('sku') in (None, HORIZONS_SKU) + and m['name'] != 'Int_PlanetApproachSuite', # noqa: E131 modules.values() ) @@ -1467,7 +1475,7 @@ def capi_is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_ST logger.error(f'economies type is {type(economies)}') if isinstance(modules, dict): - modules_horizons = any(module.get('sku') == HORIZ_SKU for module in modules.values()) + modules_horizons = any(module.get('sku') == HORIZONS_SKU for module in modules.values()) else: logger.error(f'modules type is {type(modules)}') @@ -1475,7 +1483,7 @@ def capi_is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_ST if isinstance(ships, dict): if ships.get('shipyard_list') is not None: if isinstance(ships.get('shipyard_list'), dict): - ship_horizons = any(ship.get('sku') == HORIZ_SKU for ship in ships['shipyard_list'].values()) + ship_horizons = any(ship.get('sku') == HORIZONS_SKU for ship in ships['shipyard_list'].values()) else: logger.debug('ships["shipyard_list"] is not dict - FC or Damaged Station?') From 9a58da57cd1186fa717924f56419bf70f42c4f2f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 18 Oct 2021 15:39:18 +0100 Subject: [PATCH 168/527] Pre-Release 5.2.0-beta1: appversion & changelog --- ChangeLog.md | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ config.py | 2 +- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 2eb45d0b..ee586eed 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,88 @@ produce the Windows executables and installer. --- +Pre-Release 5.2.0 beta1 +=== + +* Now built using Python 3.9.7. + +* `Update` button is disabled if CQC/Arena is detected. + +* Frontier CAPI queries now run in their own thread. There should be no + change in functionality for users. This affects both EDMarketConnector + (GUI) and EDMC (command-line). + +* `File` > `Status` will now use cached CAPI data, rather than causing a fresh + query. **Currently if data has not yet been cached nothing will happen when + trying to use this**. + +* `File` > `Save Raw Data` also now uses the cached CAPI data, rather than + causing a fresh query. This will write an empty JSON `{}` if no data is + yet available. + +* New [docs/Licenses/](docs/Licenses/) directory containing all relevant + third-party licenses for the software this application uses. + +* `Settings` > `Output` > `File Location` 'Browse' button will now always be + available, even if no output options are active. + +* The 'no git installed' logging when running from source is now at INFO + level, not ERROR. This will look less scary. + +* EDMarketConnetor command-line arguments have been re-ordered into + logical groups for `--help` output. + +* Support added for several new EDDN schemas relating to specific Journal + events. Until the live EDDN server is updated (planned for 2021-10-21) you + will see minor error logging when this fails due to 'unknown schema'. + + Schema support added for: + - `codexentry/1` + - `fssdiscoveryscan/1` + - `navbeaconscan/1` + - `navroute/1` + - `scanbarycentre/1` + +Bug Fixes +--- + +* A bug preventing `--force-localserver-auth` from working has been fixed. + +* `horizons` and `odyssey` flags should now always be set properly on *all* + EDDN messages. The `horizons` flag was missing from some. + +Developers +--- + +* New `journal_entry_cqc()` function for plugins to receive journal events + *specifically and **only** when the player is in CQC/Arena*. This allows + for tracking things that happen in CQC/Arena without polluting + `journal_entry()`. See [PLUGINS.md](PLUGINS.md) for details. + +* Command-line argument `--trace-all` to force all possible `--trace-on` to be + active. + +* Contributing.md has been updated for how to properly use `trace_on()`. + +* EDMC.(py,exe) now also makes use of `--trace-on`. + +* EDMarketConnector now has `--capi-pretend-down` to act as if the CAPI + server is down. + +* Killswitches now have support for removing key/values entirely, or forcing + the value. See [docs/Killswitches.md](docs/Killswitches.md) for details. + +* `state['Odyssey']` added, set from `LoadGame` journal event. + +* You can now test against a different EDDN server using `--eddn-url` + command-line argument. This needs to be the *full* 'upload' URL, i.e. for + the live instance this is `https://eddn.edcd.io:4430/upload/`. + +* New command-line argument `--eddn-tracking-ui` to track the EDDN handling + code's idea of the current Journal and Status.json Body(Name|ID). + +--- + Release 5.1.3 === diff --git a/config.py b/config.py index 05cacd89..77ee6860 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.1.4-beta0' +_static_appversion = '5.2.0-beta1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 3ec9c81e192df088726266162846f44e5f92d9b0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 19 Oct 2021 16:01:54 +0100 Subject: [PATCH 169/527] EDDN: Drop any 'unknown schema' messages so they're not retried --- plugins/eddn.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 7e72aa0f..b4cd508d 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -298,7 +298,10 @@ Msg:\n{msg}''' if unknown_schema := self.UNKNOWN_SCHEMA_RE.match(e.response.text): logger.debug(f"EDDN doesn't (yet?) know about schema: {unknown_schema['schema_name']}" f"/{unknown_schema['schema_version']}") - # return # Pretend it went OK so this message isn't retried + # NB: This dropping is to cater for the time when EDDN + # doesn't *yet* support a new schema. + self.replaylog.pop(0) # Drop the message + self.flush() # Truncates the file, then writes the extant data else: status['text'] = self.http_error_to_log(e) From 832316517e6b80145d102e91a8d5c3a426a19fa3 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 20 Oct 2021 09:14:43 +0100 Subject: [PATCH 170/527] requirements-dev: Bump flake8-use-fstring and flake8 itself --- requirements-dev.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 152c5507..5af19055 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ wheel # Static analysis tools -flake8==3.9.2 +flake8==4.0.1 flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 @@ -13,7 +13,7 @@ flake8-isort==4.1.1 flake8-json==21.7.0 flake8-noqa==1.2.0 flake8-polyfill==1.0.2 -flake8-use-fstring==1.1 +flake8-use-fstring==1.2 mypy==0.910 pep8-naming==0.12.1 From 3e046c1f65bc367e607c4b1fb77bd00a31e65394 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 20 Oct 2021 13:14:16 +0100 Subject: [PATCH 171/527] Pre-Release 5.2.0-beta1: appversion and changelog --- ChangeLog.md | 7 +++++++ config.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index ee586eed..fc4f79b4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,13 @@ produce the Windows executables and installer. --- +Pre-Release 5.2.0 beta2 +=== + +* Don't save, for later retry, any EDDN messages that are met with 'unknown + schema' from the server. This should alleviate any "laggy UI" problems that + their accumulation can cause. + Pre-Release 5.2.0 beta1 === diff --git a/config.py b/config.py index 77ee6860..b6cdf0d9 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.0-beta1' +_static_appversion = '5.2.0-beta2' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 531302b7da41f7e769a17b14ddde1303ece20644 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 20 Oct 2021 14:32:04 +0100 Subject: [PATCH 172/527] Notify user when 'File' > 'Status' fails Rather than a silent failure, set a status line message and also play the 'bad' sound to draw their attention to it. --- EDMarketConnector.py | 1 + L10n/en.template | 313 +++++++++++++++++++++++-------------------- stats.py | 7 + 3 files changed, 175 insertions(+), 146 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 4c480f47..897ec378 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1167,6 +1167,7 @@ class AppWindow(object): return except companion.ServerConnectionError: + # LANG: Frontier CAPI server error when fetching data self.status['text'] = _('Frontier CAPI server error') except companion.CredentialsError: diff --git a/L10n/en.template b/L10n/en.template index 2221e523..2851c474 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -1,175 +1,190 @@ /* Language name */ "!Language" = "English"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:212; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Error: Frontier CAPI didn't respond"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:231; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Error: Frontier server is lagging"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:247; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Docked but unknown station: EDO Settlement?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:257; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Error: Invalid Credentials"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:273; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Error: Wrong Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:397; companion.py:482; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Error"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:440; companion.py:445; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Error: Couldn't check token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:451; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Error: customer_id doesn't match!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:473; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Error: unable to get token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:774; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI down for maintenance"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Frontier CAPI query failure"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:786; */ -"Frontier CAPI server error" = "Frontier CAPI server error"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:485; EDMarketConnector.py:780; EDMarketConnector.py:1440; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Update"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:568; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Always on top"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:698; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Unknown"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:767; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Error: Check E:D journal file location"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:774; edsm.py:257; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:776; EDMarketConnector.py:1199; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:776; EDMarketConnector.py:1209; EDMarketConnector.py:1232; stats.py:365; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Ship"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:777; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Suit"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:778; prefs.py:606; stats.py:367; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:779; prefs.py:624; prefs.py:761; stats.py:368; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:782; EDMarketConnector.py:797; EDMarketConnector.py:800; EDMarketConnector.py:1917; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "File"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:783; EDMarketConnector.py:798; EDMarketConnector.py:801; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Edit"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:784; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "View"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:785; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Window"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:786; EDMarketConnector.py:799; EDMarketConnector.py:802; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Help"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:789; EDMarketConnector.py:815; EDMarketConnector.py:1486; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "About {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:791; EDMarketConnector.py:814; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Check for Updates..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:792; EDMarketConnector.py:806; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Save Raw Data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:793; EDMarketConnector.py:805; stats.py:362; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:794; EDMarketConnector.py:812; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Privacy Policy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:795; EDMarketConnector.py:813; EDMarketConnector.py:1520; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Release Notes"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:807; EDMarketConnector.py:1918; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Settings"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:808; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Exit"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:811; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:818; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Copy"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:824; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Logging in..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:840; EDMarketConnector.py:1351; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Authentication successful"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:871; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "You're not docked at a station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:879; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Station doesn't have anything!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:884; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Station doesn't have a market!"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:913; */ -"CQC detected, aborting CAPI query" = "CQC detected, aborting CAPI query"; +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "CAPI query aborted: Cmdr name unknown"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:934; stats.py:280; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "CAPI query aborted: Game mode unknown"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "CAPI query aborted: Current system unknown"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "CAPI query aborted: In other-ship multi-crew"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "CAPI query aborted: CQC (Arena) detected"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Fetching data..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:973; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: No commander data returned"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:977; stats.py:299; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Who are you?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:983; stats.py:309; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Where are you?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:990; stats.py:314; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "What are you flying?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1145; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Frontier CAPI server error"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Last updated at %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1174; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1175; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1176; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1434; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "cooldown {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1546; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1611; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Shutting down..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1906:1912; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1916; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1927; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -217,31 +232,31 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB Journal processing disabled. See Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:225; eddn.py:630; eddn.py:982; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Sending data to EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:274; eddn.py:920; eddn.py:955; eddn.py:994; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:292; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Error: EDMC is too old for EDDN. Please update."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:298; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Error: Validation Failed (EDMC Too Old?). See Log"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:303; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "EDDN Error: Returned {STATUS} status code"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Send station data to the Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:721; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Send system and scan data to the Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:732; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Delay sending until docked"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:796; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "EDDN journal handler disabled. See Log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ @@ -256,7 +271,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "None"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -418,230 +433,236 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Disabled Plugins"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Balance"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Loan"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federation"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:369; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Status: Don't yet know your Commander name"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Status: No CAPI data yet"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Value"; -/* stats.py: Status dialog title; In files: stats.py:378; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Ships"; diff --git a/stats.py b/stats.py index 89e79d9a..334e8358 100644 --- a/stats.py +++ b/stats.py @@ -11,6 +11,7 @@ import companion import EDMCLogging import myNotebook as nb # noqa: N813 from edmc_data import ship_name_map +from hotkey import hotkeymgr from l10n import Locale from monitor import monitor @@ -274,11 +275,17 @@ class StatsDialog(): def showstats(self) -> None: """Show the status window for the current cmdr.""" if not monitor.cmdr: + hotkeymgr.play_bad() + # LANG: Current commander unknown when trying to use 'File' > 'Status' + self.status['text'] = _("Status: Don't yet know your Commander name") return # TODO: This needs to use cached data if companion.session.FRONTIER_CAPI_PATH_PROFILE not in companion.session.capi_raw_data: logger.info('No cached data, aborting...') + hotkeymgr.play_bad() + # LANG: No Frontier CAPI data yet when trying to use 'File' > 'Status' + self.status['text'] = _("Status: No CAPI data yet") return capi_data = json.loads( From 3f0f1fe39f1ea611e43c56f0888a4099d250e317 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 20 Oct 2021 14:50:03 +0100 Subject: [PATCH 173/527] CAPI: Avoid '... EDO Settlement?' for 'Update' in space 1. Logged out in space 2. Logged back in 3. Run EDMC 4. Hit Update button, get "Docked but unknown station: EDO Settlement?" In investigating this I realised that the entire else needed to be "if docked according to CAPI". Then it became clear that there was a redundant conditional, as the enclosing one is already testing: `capi_response.capi_data['lastStarport']['name'] != monitor.station:` Making the: `if last_station != monitor.station` conditional un-necessary. --- EDMarketConnector.py | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 4c480f47..c0614bdc 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1072,24 +1072,13 @@ class AppWindow(object): f"{monitor.state['OnFoot']!r} and {monitor.station!r}") raise companion.ServerLagging() - else: - last_station = None - if capi_response.capi_data['commander']['docked']: - last_station = capi_response.capi_data['lastStarport']['name'] - - if monitor.station is None: - # Likely (re-)Embarked on ship docked at an EDO settlement. - # Both Disembark and Embark have `"Onstation": false` in Journal. - # So there's nothing to tell us which settlement we're (still, - # or now, if we came here in Apex and then recalled ship) docked at. - logger.debug("monitor.station is None - so EDO settlement?") - raise companion.NoMonitorStation() - - if last_station != monitor.station: - # CAPI lastStarport must match - logger.warning(f"({capi_response.capi_data['lastStarport']['name']!r} != {monitor.station!r})" - f" AND {last_station!r} != {monitor.station!r}") - raise companion.ServerLagging() + elif capi_response.capi_data['commander']['docked'] and monitor.station is None: + # Likely (re-)Embarked on ship docked at an EDO settlement. + # Both Disembark and Embark have `"Onstation": false` in Journal. + # So there's nothing to tell us which settlement we're (still, + # or now, if we came here in Apex and then recalled ship) docked at. + logger.debug("docked AND monitor.station is None - so EDO settlement?") + raise companion.NoMonitorStation() self.capi_query_holdoff_time = capi_response.query_time + companion.capi_query_cooldown From 00e46679d0e7fb39f0b688a7eda546eb143c3bd9 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 20 Oct 2021 15:11:59 +0100 Subject: [PATCH 174/527] Pre-Release 5.2.0-beta3: appversion & changelog --- ChangeLog.md | 11 +++++++++++ config.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index fc4f79b4..ab487120 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -30,6 +30,17 @@ produce the Windows executables and installer. Pre-Release 5.2.0 beta2 === +* Trying to use `File` > `Status` when the current commander is unknown, or + there is has been no CAPI data retrieval yet, will now result in the 'bad' + sound being played and an appropriate status line message. + +* Pressing the 'Update' button when in space (not docked, not on a body + surface) will no longer cause a spurious "Docked but unknown station: EDO + Settlement?" message. + +Pre-Release 5.2.0 beta2 +=== + * Don't save, for later retry, any EDDN messages that are met with 'unknown schema' from the server. This should alleviate any "laggy UI" problems that their accumulation can cause. diff --git a/config.py b/config.py index b6cdf0d9..93078020 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.0-beta2' +_static_appversion = '5.2.0-beta3' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 7e1c1be08bf2cd79000c295b7f56791c151f38a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 17:03:58 +0000 Subject: [PATCH 175/527] build(deps-dev): bump flake8-use-fstring from 1.2 to 1.2.1 Bumps [flake8-use-fstring](https://github.com/MichaelKim0407/flake8-use-fstring) from 1.2 to 1.2.1. - [Release notes](https://github.com/MichaelKim0407/flake8-use-fstring/releases) - [Commits](https://github.com/MichaelKim0407/flake8-use-fstring/compare/v1.2...v1.2.1) --- updated-dependencies: - dependency-name: flake8-use-fstring dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 5af19055..1814aec0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,7 +13,7 @@ flake8-isort==4.1.1 flake8-json==21.7.0 flake8-noqa==1.2.0 flake8-polyfill==1.0.2 -flake8-use-fstring==1.2 +flake8-use-fstring==1.2.1 mypy==0.910 pep8-naming==0.12.1 From a622d1673a6cb3e9fd317b71ec6f2e9d2e3eb837 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Oct 2021 17:02:29 +0000 Subject: [PATCH 176/527] build(deps-dev): bump flake8-use-fstring from 1.2.1 to 1.3 Bumps [flake8-use-fstring](https://github.com/MichaelKim0407/flake8-use-fstring) from 1.2.1 to 1.3. - [Release notes](https://github.com/MichaelKim0407/flake8-use-fstring/releases) - [Commits](https://github.com/MichaelKim0407/flake8-use-fstring/compare/v1.2.1...v1.3) --- updated-dependencies: - dependency-name: flake8-use-fstring dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1814aec0..16d01f5a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,7 +13,7 @@ flake8-isort==4.1.1 flake8-json==21.7.0 flake8-noqa==1.2.0 flake8-polyfill==1.0.2 -flake8-use-fstring==1.2.1 +flake8-use-fstring==1.3 mypy==0.910 pep8-naming==0.12.1 From 13d0f94a467b64b66eb4e9c0a75204bd1f567105 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 25 Oct 2021 10:54:57 +0100 Subject: [PATCH 177/527] L10n: Translations updated --- L10n/cs.strings | 399 +++++++++++++++++------------------ L10n/de.strings | 444 ++++++++++++++++++++------------------- L10n/es.strings | 411 ++++++++++++++++++------------------ L10n/fi.strings | 399 +++++++++++++++++------------------ L10n/fr.strings | 352 +++++++++++++++---------------- L10n/hu.strings | 342 +++++++++++++++--------------- L10n/it.strings | 387 +++++++++++++++++----------------- L10n/ja.strings | 444 ++++++++++++++++++++------------------- L10n/ko.strings | 452 +++++++++++++++++++++------------------- L10n/lv.strings | 322 ++++++++++++++-------------- L10n/nl.strings | 352 +++++++++++++++---------------- L10n/pl.strings | 444 ++++++++++++++++++++------------------- L10n/pt-BR.strings | 444 ++++++++++++++++++++------------------- L10n/pt-PT.strings | 444 ++++++++++++++++++++------------------- L10n/ru.strings | 444 ++++++++++++++++++++------------------- L10n/sl.strings | 287 ++++++++++++------------- L10n/sr-Latn-BA.strings | 420 +++++++++++++++++++------------------ L10n/sr-Latn.strings | 444 ++++++++++++++++++++------------------- L10n/sv-SE.strings | 347 +++++++++++++++--------------- L10n/uk.strings | 383 +++++++++++++++++----------------- L10n/zh-Hans.strings | 422 +++++++++++++++++++------------------ 21 files changed, 4241 insertions(+), 4142 deletions(-) diff --git a/L10n/cs.strings b/L10n/cs.strings index abc52781..5dc62b4a 100644 --- a/L10n/cs.strings +++ b/L10n/cs.strings @@ -1,172 +1,166 @@ /* Language name */ "!Language" = "Čeština"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Chyba: Frontier CAPI neodpovídá"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Chyba: Server Frontieru nejede"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Chyba: Server Frontieru laguje"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Chyba: Chybné přihlašovací údaje"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Chyba: Nesprávný CMDR"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Chyba"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Chyba: Nelze se připojit k Inaře"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Chyba: Nejde ověřit token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Chyba: customer_id nesouhlasí!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Chyba: nepovedlo se získat token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Dotaz na Frontier CAPI selhal"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Chyba Frontier CAPI serveru"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Aktualizovat"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Vždy navrchu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Neznámý"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Loď"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Oblek"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Systém"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stanice"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Soubor"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Upravit"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Zobrazit"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Nápověda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Zkontrolovat aktualizace..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Uložit surová data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Zásady ochrany osobních údajů"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Poznámky k verzi"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Nastavení"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Ukončit"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentace"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopírovat"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Přihlašování..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Přihlášení bylo úspěšné"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Nejste zadokováni ve stanici!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Stanice nenabízí žádné služby!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Stanice nemá obchod!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Načítání dat..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Nebyla vrácena žádná data komandéra"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Kdo jste?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Kde zrovna jste?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "S jakou lodí létáte?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Chyba Frontier CAPI serveru"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Poslední aktualizace %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Počkej ještě {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Vypínání..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jeden nebo více aktivních pluginů ještě stále nepodporuje Python 3.x. Podívejte se na jejich seznam v záložce '{PLUGINS}' v '{FILE}' > '{SETTINGS}'. Zkontrolujte si jestli není dostupná novější verze pluginu, pokud ne, tak kontaktujte vývojáře pluginu o tom, že musí upravit jejich plugin pro Python 3.x.\n\nPlugin můžete vypnout přidáním '{DISABLED}' na konec názvu jeho složky."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy, které nepodporují Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -181,7 +175,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorovat"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Výchozí"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -214,416 +208,413 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Zpracování EDDB deníku je deaktivováno. Zkontrolujte log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Odesílání dat do EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Chyba: Nelze se připojit k EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Odeslat data o stanici do Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Odeslat sken a data o systému do Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Pozdržet odeslání po zadokování"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "Obsluha EDDN deníku je deaktivována. Zkontrolujte log."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Odesílat letový log a status CMDRa do EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Přihlašovací údaje Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Jméno CMDRa"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API klíč"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Žádná"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "Obsluha EDSM deaktivována. Zkontrolujte log."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Chyba: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Chyba: Nelze se připojit k EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Odesílat letový log a status CMDRa na Inaru"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Přihlašovací údaje k Inaře"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara deaktivována. Zkontrolujte log."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Chyba: Server Frontieru SKU problém"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Chyba: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Nastavení"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Vyberte, která data chcete ukládat"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Obchodní data ve formátu CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Obchodní data ve formátu Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Konfigurace lodi"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automaticky aktualizovat při zadokování"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Cesta k souboru"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Změnit..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Procházet..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Výstup"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D umístění souboru deníku"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Klávesová zkratka"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Klávesová zkratka"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Restartujte {APP} pro aktivaci klávesových zkratek"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} vyžaduje oprávnění pro použití klávesových zkratek"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Otevřít Předvolby systému"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Pouze pokud je Elite: Dangerous aktivní"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Přehrát zvuk"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Vypnout automatickou kontrolu aktualizací aplikace, pokud jste ve hře"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Preferované stránky"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Shipyard"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Použít alternativní URL metodu"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Míra logování"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Nastavení"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Soukromí"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normální text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Zvýrazněný text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Jazyk"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Schéma"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Tmavé"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Průhledné"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Procenta UI škálování"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 je výchozí hodnota{CR}je potřeba restartovat,{CR}aby se změna projevila!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Průhlednost hlavního okna"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 znamená plně neprůhledné.{CR}Okno se aktualizuje v reálném čase"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Vzhled"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Složka pluginů"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Otevřít"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: Plugin můžete vypnout přidáním{CR}'{EXT}' do názvu jeho složky"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Zapnuté pluginy"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Pluginy bez podpory Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informace jak migrovat pluginy."; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Vypnuté pluginy"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Zůstatek"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Půjčka"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federation"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Minimalizovat do lišty"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Poddůstojník"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Cena"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Lodě"; diff --git a/L10n/de.strings b/L10n/de.strings index 1e5936d2..83a5963f 100644 --- a/L10n/de.strings +++ b/L10n/de.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Prüfe"; /* Language name */ "!Language" = "Deutsch"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Fehler: Frontier CAPI antwortet nicht"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Fehler: Frontier-Server ist offline"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Fehler: Frontier-Server ist überlastet"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Angedockt aber unbekannte Station: EDO-Siedlung?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Fehler: Ungültige Anmeldedaten"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Fehler: Falscher Kdt."; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Fehler"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Fehler: Verbindung zu Inara fehlgeschlagen"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Fehler: Konnte das Token customer_id nicht prüfen"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Fehler: customer_id stimmt nicht überein!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Fehler: konnte Token nicht erhalten"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI offline wegen Wartung"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Frontier CAPI Anfrage gescheitert"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Frontier CAPI Server-Fehler"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Aktualisieren"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Immer im Vordergrund"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Unbekannt"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Fehler: Prüfe E:D Journal Dateispeicherort"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Kdt."; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Rolle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Schiff"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Anzug"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Datei"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Bearbeiten"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Ansicht"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Fenster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Hilfe"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Über {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Auf Aktualisierungen überprüfen..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Speichere Originaldaten..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Datenschutzrichtlinie"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Anmerkungen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Einstellungen"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Beenden"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopieren"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Anmelden..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Authentifizierung erfolgreich"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Du bist an keiner Station angedockt!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Diese Station hat nichts!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Diese Station hat keinen Markt!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "CAPI Anfrage abgebrochen: Kdt. Name unbekannt"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "CAPI Anfrage abgebrochen: Spielmodus unbekannt"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "CAPI Anfrage abgebrochen: Aktuelles System unbekannt"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "CAPI Anfrage abgebrochen: In anderem Schiff in Multicrew"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "CAPI Anfrage abgebrochen: CQC (Arena) erkannt"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Daten werden abgerufen..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Keine Kommandanten-Daten erhalten"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Wer bist du?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Wo bist du?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Was fliegst du?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Frontier CAPI Server-Fehler"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Zuletzt aktualisiert um %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Kanonier"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Steuer"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Wartezeit {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Programm schließt..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Eins oder mehr deiner aktivierten Plugins hat noch keinen Support für Python 3.x. Du kannst dir die Liste im '{PLUGINS}'-Tab unter '{FILE}' > '{SETTINGS}' ansehen. Du solltest prüfen, ob es für diese Updates gibt und ansonsten dem Entwickler Bescheid geben, dass sie ihren Code für Python 3.x aktualisieren müssen.\n\nDu kannst ein Plugin deaktivieren, indem du dessen Ordner ein '{DISABLED}' am Ende des Namens anhängst."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins ohne Python 3.x Support"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorieren"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Standard"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB Journal-Verarbeitung deaktiviert. Siehe Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Daten werden an das EDDN gesendet..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Fehler: Keine Verbindung zum EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN-Fehler: EDMC ist zu alt für EDDN. Bitte aktualisieren."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN-Fehler: Validierung fehlgeschlagen (EDMC zu alt?). Siehe Log"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "EDDN-Fehler: {STATUS} Statuscode zurückgegeben"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Schicke Stationsdaten an das Elite Dangerous Data Netzwerk"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Sende System- und Scandaten zum Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Senden verzögern bis angedockt"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "EDDN Journal-Handler deaktiviert. Siehe Log."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Sende Fluglog und CMDR-Status an EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite: Dangerous Star Map Anmeldedaten"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Kommandantenname"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Schlüssel"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Keine Zuweisung"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "EDSM-Handler deaktiviert. Siehe Log."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Fehler: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Fehler: Kann keine Verbindung zu EDSM aufbauen"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Sende Fluglog und CMDR-Status an Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara-Anmeldedaten"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara deaktiviert. Siehe Log."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Fehler: Frontier-Server SKU Problem"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Fehler: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Einstellungen"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Bitte wähle zu speichernde Daten aus"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Marktdaten als CSV Datei"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Marktdaten als Trade-Dangerous Datei"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Schiffsausstattung"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automatisch beim Andocken aktualisieren"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Speicherort"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Ordner..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Durchsuchen..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Ausgabe"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D Journal Dateispeicherort"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Makro"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Starte {APP} neu, um den Tastenkürzel nutzen zu können"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} benötigt für Tastenkürzel Systemrechte (Bedienungshilfen)"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Öffne Systemeinstellungen"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Nur wenn Elite: Dangerous geöffnet ist"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Ton abspielen"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Während das Spiel läuft nicht auf Updates überprüfen"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Favorisierte Webseiten"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Werft"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Alternative URL-Methode benutzen"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Log-Level"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfiguration"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Haupt-UI-Datenschutzoptionen"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Private Gruppe-Name im UI verstecken"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Multi-Crew Kapitänsnamen verstecken"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Datenschutz"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normaler Text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Hervorgehobener Text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Sprache"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Theme"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Dunkel"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparent"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "UI-Skalierung in Prozent"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 bedeutet Standardwert{CR}Neustart erforderlich, um{CR}Änderungen zu übernehmen!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Durchsichtigkeit Hauptfenster"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 bedeutet komplett undurchsichtig.{CR}Fenster wird in Echtzeit aktualisiert"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Aussehen"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Plugin-Ordner"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Öffnen"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tipp: Du kannst ein Plugin deaktivieren, indem{CR}du '{EXT}' zu seinem Ordnernamen hinzufügst"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Aktivierte Plugins"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Plugins ohne Python 3.x Support"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informationen zum Migrieren von Plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Deaktivierte Plugins"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Kontostand"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Kredit"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Kampfrang"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Handelsrang"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Erkunderrang"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC-Rang"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Föderation"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Imperium"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Machtspiele"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmlos"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Zumeist Harmlos"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Neuling"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Kompetent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Experte"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Meister"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Gefährlich"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Tödlich"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Bettelarm"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Sehr Arm"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Krämer"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Kleinhändler"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Kaufmann"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Großhändler"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Unternehmer"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Magnat"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Total planlos"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "In die Taskleiste minimieren"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Fast Planlos"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Späher"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Landkundiger"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Wegebner"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pistensucher"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Aufseher"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pionier"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Hilflos"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Zumeist Hilflos"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Anfänger"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Halbprofi"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Profi"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Sieger"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Held"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Rekrut"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Kadett"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Fähnrich"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Maat"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Obermaat"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Feldwebel"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Leutnant"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Kapitänleutnant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Korvettenleutnant"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Fregattenkapitän"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Kapitän"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Konteradmiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vizeadmiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Fremder"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Leibeigener"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Knappe"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Ritter"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Fürst"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Graf"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquise"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Herzog"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prinz"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "König"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Wertung 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Wertung 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Wertung 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Wertung 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Wertung 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Status: Dein Kommandanten-Name ist noch nicht bekannt"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Status: Noch keine CAPI-Daten"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Wert"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Schiffe"; diff --git a/L10n/es.strings b/L10n/es.strings index e33e4c98..22ac976d 100644 --- a/L10n/es.strings +++ b/L10n/es.strings @@ -1,180 +1,172 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Comprobar"; /* Language name */ "!Language" = "Español"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Error: El CAPI de Frontier no respondió"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Error: El servidor de Frontier está caído"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Error: El servidor de Frontier está retrasado"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Atracado pero estación desconocida: ¿Asentamiento EDO?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Error: Credenciales Inválidas"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Error: Cmdt Incorrecto"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Error"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Error: No se puede conectar con Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Error: No se pudo comprobar el token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Error: ¡customer_id no coincide!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Error: no se pudo conseguir el token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Fallo de consulta del CAPI de Frontier"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Error de servidor CAPI de Frontier"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Actualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Siempre visible"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Desconocido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Error: Comprueba la localización del fichero journal de E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Estación"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Archivo"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Visualización"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Ventana"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Ayuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Acerca de {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Buscar Actualizaciones..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Guardar Datos Sin Procesar..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Estado"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Política de Privacidad"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Notas de la versión"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Configuración"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Salir"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Documentación"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Identificándose..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autenticación correcta"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "¡No estás atracado en una estación!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "¡La estación no tiene nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "¡La estación no tiene mercado!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Recopilando datos..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: No se devolvió datos de comandante"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "¿Quién eres?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "¿Dónde estás?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "¿Qué estás volando?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Error de servidor CAPI de Frontier"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Última actualización: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Caza"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Artillero"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Timón"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Espere {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "Aceptar"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Apagando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o más de tus plugins habilitados aún no tienen soporte para Python 3.x. Por favor, consulta la lista en la pestaña '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Deberías comprobar si hay una versión actualizada disponible, si no, avisa al desarrollador de que necesita actualizar el código para Python 3.x.\n\nPuedes deshabilitar un plugin cambiando el nombre de su carpeta para que tenga '{DISABLED}' al final del nombre."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Sin Soporte para Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +181,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorar"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Por defecto"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +214,422 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Procesamiento de Journal para EDDB desactivado. Ver Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Enviando datos a EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Error: No se puede conectar a EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Error EDDN: EDMC es demasiado antiguo para EDDN. Actualiza por favor."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Error EDDN: Validación Fallida (¿EDMC Demasiado Antiguo?). Revisa el Log"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "Error EDDN: Devolvió código de estado {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Enviar datos de la estación a Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Enviar datos de sistema y escáner a Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Retrasar envío hasta el atraque"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "Manejo de Journal para EDDN desactivado. Ver Log."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Enviar Registro de Vuelo y estado del CMDT a EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Credenciales de Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Nombre de Comandante"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Llave API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ninguna"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "Manejo de Journal para EDSM desactivado. Ver Log."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Error: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Error: No se puede conectar a EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Enviar Registro de Vuelo y estado del CMDT a Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Credenciales de Inara"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara desactivado. Ver Log."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Error: Problema de SKU en el servidor de Frontier"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Error: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Preferencias"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Seleccione qué datos quiere guardar"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Datos de mercado en formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Datos de mercado en formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Equipamiento de la Nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Actualizar automáticamente al atracar"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Localización de archivos"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Cambiar..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Examinar..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Salida"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Localización del archivo de Journal de E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Tecla de acceso directo"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Tecla de acceso directo"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Reinicie {APP} para usar los accesos directos de teclado"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} necesita permisos para usar teclas de acceso directo"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Abrir Preferencias del Sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Solo cuando Elite: Dangerous es la aplicación activa"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Reproducir sonido"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Desactivar Comprobación Automática de Actualizaciones de la Aplicación mientras juega"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Sitios Web preferidos"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Astillero"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Usar método URL alternativo"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Nivel de registro"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Configuración"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privacidad"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Texto normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Texto resaltado"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Idioma"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Oscuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Porcentaje escala UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Por Defecto{CR}Se requiere reiniciar{CR}para que los cambios surtan efecto!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Transparencia de la ventana principal"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 significa completamente opaco.{CR}La ventana se actualiza en tiempo real."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Apariencia"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Carpeta de Plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Abrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Puedes desactivar un plugin añadiendo{CR}'{EXT}' al nombre de su carpeta"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Plugins Activados"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Plugins sin soporte para Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Información sobre migración de plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Plugins Desactivados"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Préstamo"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combate"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Comercio"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Exploración"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federación"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Imperio"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Inofensivo"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Casi inofensivo"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novato"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competente"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Experto"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Maestro"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Peligroso"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Letal"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Élite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Pobre"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Casi pobre"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Buhonero"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Distribuidor"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Mercader"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Bróker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Empresario"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Magnate"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Perdido"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Minimizar a la bandeja de sistema"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Casi perdido"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Explorador"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Topógrafo"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Rastreador"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Guía"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Descubridor"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pionero"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Indefenso"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Casi indefenso"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Aficionado"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semiprofessional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Profesional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Campeón"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Héroe"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiador"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recluta"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadete"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Guardiamarina"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Sargento"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Sargento primero"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Subteniente"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Alférez de fragata"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Teniente de navío"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Capitán de corbeta"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Capitán de fragata"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Capitán de navío"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Contraalmirante"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vicealmirante"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Almirante"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Forastero"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Siervo"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Escudero"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Caballero"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Señor"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Barón"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Vizconde"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Conde"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Conde Palatino"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marqués"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duque"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Príncipe"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Rey"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Nivel 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Nivel 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Nivel 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Nivel 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Nivel 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Valor"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Naves"; diff --git a/L10n/fi.strings b/L10n/fi.strings index bb260466..7a463158 100644 --- a/L10n/fi.strings +++ b/L10n/fi.strings @@ -1,172 +1,166 @@ /* Language name */ "!Language" = "Suomi"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Virhe: Frontier CAPI ei vastaa."; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Virhe: Frontierin palvelin ei vastaa"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Virhe: Frontierin palvelin vastaa vanhoilla tiedoilla"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Virhe: kirjautuminen ei kelpaa"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Virhe: väärä komentaja"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Virhe"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Virhe: Ei yhteyttä Inaraan"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Virhe: Ei kyetty tarkastamaan polettia customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Virhe: customer_id ei löydy vastaavuutta!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Virhe: ei kyetty saamaan polettia"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Frontier CAPI kyselyvirhe."; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Frontier CAPI palvelinvirhe."; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Päivitä"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Aina päällimmäisenä"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Tuntematon"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Rooli"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Alus"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Asuste"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Järjestelmä"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Asema"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Tiedosto"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Muokkaa"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Näytä"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Ikkuna"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Apua"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Ohjelmasta {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Tarkista päivitykset..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Tallenna raakadata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Tila"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Tietosuojakäytäntö"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Julkaisutiedot"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Valinnat"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Lopeta"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentaatio"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopioi"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Kirjaudutaan..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Todennus onnistui"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Et ole telakoituneena asemalle!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Asemalla ei ole mitään!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Asemalla ei ole kaupankäyntiä!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Noudetaan tietoja..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: tietoja ei löytynyt"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Kuka olet?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Missä olet?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Mitä alusta lennät?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Frontier CAPI palvelinvirhe."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Päivitetty viimeksi %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Hävittäjä"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Aseiden käyttäjä"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Pilotti"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Jäähtymisaika {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Sulkeutuu..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Yksi tai useampi käyttämistäsi lisäosista ei sisällä vielä Pyhton 3.x -tukea. Tarkista tiedoston '{FILE}' > '{SETTINGS}' välilehti '{PLUGINS}' lisäosista, onko niistä uudempaa versiota saatavilla; muussa tapauksessa ota yhteyttä sen kehittäjään ja kerro, että sen lähdekoodi on päivitettävä Python 3.x -tasolle.\n\nVoit estää lisäosan toiminnan nimeämällä sen hakemiston siten, että se päättyy tekstiin '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Lisäosat"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Lisäosat ilman Python 3.x -tukea"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -181,422 +175,419 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Älä huomioi"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Oletus"; /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB lokikirjan käsittely ei käytössä. Katso lokitiedot."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Lähetetään tietoja EDDN:ään..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Virhe: ei saatu yhteyttä EDDN:ään"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Lähetä asematiedot Elite Dangerous Data Network -palveluun"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Lähetä järjestelmä- ja skannaustiedot Elite Dangerous Data Network -palveluun"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Lähetä tiedot vasta telakoitumisen jälkeen"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "EDDB lokikirjan käsittelijä ei käytössä. Katso lokitiedot."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Lähetä lentoloki ja komentajatiedot EDSM:ään"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map -kirjautuminen"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Komentajanimi"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API avain"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ei määritelty"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "ESDM käsittelijä ei käytössä. Katso lokitiedot."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Virhe: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Virhe: ei saatu yhteyttä EDSM:ään"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Lähetä lentoloki ja komentajatiedot Inaraan"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inaran kirjautuminen"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara ei käytössä. Katso lokitiedot."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Virhe: Frontier -palvelimen SKU-ongelma"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Inaran virhe: {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Valinnat"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Valitse mitkä tiedot tallennetaan"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Markkinadata CSV -formaatissa"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Markkinadata Trade Dangerous -formaatissa"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Aluksen konfiguraatio"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Päivitä automaattisesti telakoituessa"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Tiedostosijainti"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Muuta..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Selaa..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Tallennus"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D lokikirjan tiedostosijainti"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Näppäimistöoikopolku"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Pikanäppäin"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Käynnistä {APP} uudelleen käyttääksesi pikanäppäimiä"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} tarvitsee lupasi pikakuvakkeiden käyttämiseen"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Avaa järjestelmän asetukset"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Vain jos Elite:Dangerous on käynnissä"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Toista ääni"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Estä automaattiset päivitystarkastukset pelaamisen aikana"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Ensisijaiset sivustot"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Telakka"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Käytä vaihtoehtoista URL-metodia"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Lokin syvyys"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Valinnat"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Yksityisyys"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normaali teksti"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Korostettu teksti"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Kieli"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Teema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Tumma"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Läpinäkyvä"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Käyttöliittymän skaalausprosentti"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 tarkoittaa oletusta{CR}Muutosten käyttöönotto{CR}edellyttää uudelleenkäynnistystä!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Pääikkunan läpinäkyvyys"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 tarkoittaa täysin peittävää.{CR}Ikkuna päivittyy reaaliajassa."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Ulkoasu"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Lisäosien hakemistosijainti"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Avaa"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Vihje: Voit poistaa lisäosan käytöstä{CR}lisäämällä '{EXT}' sen hakemistonimeen"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Käytössä olevat liitännäiset"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Lisäosat, joissa ei ole Python 3.x -tukea:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Tietoja lisäosien siirrosta"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Estetyt liitännäiset"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Lainaa jäljellä"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Taistelija -ranking"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Kaupankäynti -ranking"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Tutkimusmatkailija -ranking"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC -ranking"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federaation sotilasarvosi"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Imperiumin sotilasarvosi"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Valtapeli -ranking"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Pienennä tehtäväpalkkiin"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Luokitus 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Luokitus 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Luokitus 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Luokitus 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Luokitus 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Arvo"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Alukset"; diff --git a/L10n/fr.strings b/L10n/fr.strings index 5f83a098..c6fbee13 100644 --- a/L10n/fr.strings +++ b/L10n/fr.strings @@ -1,524 +1,518 @@ /* Language name */ "!Language" = "Français"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Erreur : Le serveur Frontier est indisponible"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Erreur : Le serveur Frontier ne répond pas"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Erreur : Identifiants invalides"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Erreur : Cmdr incorrect"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Erreur : Connexion impossible à Inara"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Mettre à jour"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Toujours visible"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmd"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Rôle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Vaisseau"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Combinaison"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Système"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Fichier"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Édition"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Présentation"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Fenêtre"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Aide"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "À propos de {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Chercher une mise à jour..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Sauvegarder les Données Brutes..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "État"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Politique de Confidentialité"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Notes de publication"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Paramètres"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Quitter"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Copier"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Connexion en cours..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Authentification réussie"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Vous n'êtes pas amarré à une station !"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "La station n'a rien du tout !"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "La station n'a pas de marché !"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Récupération des données..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Qui êtes-vous ?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Où êtes-vous ?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Avec quoi volez-vous ?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Dernière mise à jour à %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Chasseur"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Artilleur"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Pilote"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Temps de recharge {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Un ou plusieurs de vos plugins activés ne sont pas encore compatibles avec Python 3.x. Regardez la liste sur l'onglet '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Vous devriez vérifier s'il y a une version mise à jour, sinon alertez le développeur qu'il doit mettre à jour le code pour Python 3.x.\n\nVous pouvez désactiver un plugin en renommant son dossier pour qu'il ait '{DISABLED}' à la fin du nom."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins non compatibles avec Python 3.x"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Par défaut"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Envoi des données à EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Erreur : Connexion impossible à EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Envoyer les données de la station à Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Envoyer les systèmes et les informations de scan à Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Retarder l'envoi jusqu'à l'amarrage"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Envoyer le journal de vol et le statut Cmdr à EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Informations d'identification pour Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Nom du commandant"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Clé API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Aucun"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Erreur : EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Erreur : Connexion impossible à EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Envoyer le journal de vol et le statut Cmdr à Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Informations d'identification pour Inara"; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Erreur : Le serveur Frontier a un problème de SKU"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Erreur : Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Préférences"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Veuillez choisir les données à sauvegarder"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Données du marché au format CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Données du marché au format Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Équipements du vaisseau"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Mettre à jour automatiquement à l'amarrage"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Emplacement des fichiers"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Spécifier..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Parcourir..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Sorties"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Emplacement du journal E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Raccourci clavier"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Raccourci clavier"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Rédémarrez {APP} pour utiliser les raccourcis"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} a besoin de permissions pour utiliser les raccourcis"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Ouvrir Préférences Système"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Seulement quand Elite: Dangerous est l'application active"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Jouer un son"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Désactiver la vérification automatique des mises à jour quand vous êtes en jeu"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Sites préférés"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Chantier naval"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Configuration"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Confidentialité"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Texte normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Texte en surbrillance"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Langue"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Thème"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Foncé"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparent"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Apparence"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Répertoire des plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Ouvrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Astuce : Vous pouvez désactiver un plugin en{CR}ajoutant '{EXT}' à son nom de répertoire"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Plugins activés"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informations sur la migration des plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Plugins désactivés"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Solde"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Emprunt"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combattant"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Commerçant"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorateur"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Fédération"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Inoffensif"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Bleu"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Compétent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Vilain"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Vétéran"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Létal"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Élite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Sans-le-sou"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mendiant"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Boutiquier"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Revendeur"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Marchand"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Courtier"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Magnat"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Vagabond"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Touriste"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Voyageur"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Éclaireur"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Prospecteur"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Découvreur"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Navigateur"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pionnier"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recrue"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Matelot"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Second Maître"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Premier Maître"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Major"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Enseigne"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Capitaine de Corvette"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Capitaine de Frégate"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Capitaine de Vaisseau"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Contre-Amiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice-Amiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Amiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Étranger"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Écuyer"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Chevalier"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Banneret"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Vicomte"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Comte"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Duc"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Archiduc"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Roi"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rang 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rang 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rang 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rang 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rang 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Valeur"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Vaisseaux"; diff --git a/L10n/hu.strings b/L10n/hu.strings index 0df65833..34055ac0 100644 --- a/L10n/hu.strings +++ b/L10n/hu.strings @@ -1,509 +1,503 @@ /* Language name */ "!Language" = "Magyar"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Hiba:Frontier szerver nem elérhető"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Hiba:Frontier szerver laggol"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Hiba:Érvénytelen hitelesítő adatok"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Hiba:Rossz parancsnok"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Hiba:Nem lehet kapcsolódni az Inarához"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Frissítés"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Mindig felül"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Parancsnok"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Szerep"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Hajó"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Rendszer"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Állomás"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Fájl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Szerkeszt"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Nézet"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Ablak"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Segítség"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Az {APP} névjegye"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Frissítések keresése"; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Nyers adat elmentése"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Státusz"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Adatvédelmi irányelvek"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Kiadási megjegyzések"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Beállítások"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Kilépés"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentáció"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Másol"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Bejelentkezés"; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "A hitelesítés sikerült"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = " Nem dokkoltál az állomáson"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Az állomáson nincs semmi!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Nincs piac az állomáson!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Adatok lekérése"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Ki vagy?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Hol vagy?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Mivel repülsz?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Utoljára frissítve %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Vadászgép"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Lövész"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Kormányos"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Lehűl {SS} másodperc"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "Ok"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Pluginok"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Alap"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Adatok küldése az EDDN-nek..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Hiba:Nem lehet kapcsolódni az EDDN-hez"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Állomás adatok küldése az EDDN-nek"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Rendszer és szken adatok küldése az EDDN-nek"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Küldés késletetése amig dokkolsz"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Repülési napló és Parancsnok státusz küldése az EDSM-nek"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Csillag térkép hitelesítése"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Parancsnok név"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API kulcs"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Egyik sem"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Hiba:EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Hiba:nem lehet kapcsólodni az EDSM-hez"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Repülési napló és Parancsnok státusz küldése az Inarának"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara hitelesitő adatok"; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Hiba:Frontier szerver SKU probléma"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Hiba:Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Beállítások"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Kérem válassza ki a menteni kivánt adatokat."; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Piaci adat CSV fájlban"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Piaci adat Trade Dangerous fájlban"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Hajó felszerelése"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automatikusan frissit dokkolásnál"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Fálj helye"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Módosítás..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Böngész"; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Kimenet"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D journal fájl helye"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Billentyűparancsok"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Gyorsgomb"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Újranidítás {APP} parancsikonok használatával"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} engedély szükséges a parancsikon használatához"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Rendszerbeállítások megnyitáss"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Csak ha az Elite Dangerous fut"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Zene be"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Preferált weboldalak"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Hajógyár"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfiguráció"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Titkosítás"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normál txt"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Kiemelt szöveg"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Nyelv"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Téma"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Sötét"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Átlárható"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Megjelenés"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Plugin mappa"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Nyisd ki"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tipp:a pluginokat kikapcsolhatod hozzà{CR}adsz a mappa nevében egy '{EXT}'"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Pluginok engedélyezése"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Plugin kikapcsolása"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Egyenleg"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Kölcsön"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Harc"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Kereskedés"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Felfedező"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Föderáció"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Birodalom"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "ártalmatlan"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Többnyire ártalmatlan"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Kezdő"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Képesített"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Szakértő"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Mester"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Veszélyes"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Halálos"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elit"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Nincstelen"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Többnyire nincstelen"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Házaló ügynők"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Kereskedő"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Kereskedő"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Bróker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Vállalkozó"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Iparmágnás"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Céltalan"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Tøbnyire céltalan"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Felderítő"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Megfigyelő"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Útkereső"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Útkereső"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Vándor"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Utász"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "tehetetlen"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Többnyire tehetetlen"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amatőr"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Fél profi"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Szakember"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Bajnok"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hős"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiátor"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Újonc"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Kadét"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Tengerészkadét"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Tizedes"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Törzs zászlós"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Tiszthelyettes"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Zászlós"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Hadnagy"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Főhadnagy"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Ezredes"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Ellentengernagy"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "FőEllentengernagy"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Altengernagy"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admirális"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Kivűlálló"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Jobbágy"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Földesúr"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Lovag"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Báró"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Vicomte"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Számol"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Gróf"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Őrgróf"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Herceg"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Herceg"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Király"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Osztákgozás 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Osztályozás 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Osztályozás 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Osztályozás 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Osztályozás 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Érték"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Hajók"; diff --git a/L10n/it.strings b/L10n/it.strings index c68d4d82..928e5b89 100644 --- a/L10n/it.strings +++ b/L10n/it.strings @@ -1,159 +1,151 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Controlla"; /* Language name */ "!Language" = "Italiano"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Errore: Il Server Frontier è offline"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Errore: il server Frontier sta laggando"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Errore: Credenziali non valide"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Errore: Cmdr sbagliato"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Errore"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Errore: Non riesco a connettermi a Inara"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Errore nel server Frontier CAPI"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Recupera"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Sempre in primo piano"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Sconosciuto"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Ruolo"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Tuta"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stazione"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "File"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Appunti"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Vista"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Finestra"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Guida"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Informazioni su {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Controlla aggiornamenti..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Salva i Dati Grezzi..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Informativa sulla privacy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Note di rilascio"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Impostazioni"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Esci"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Documentazione"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Copia"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Mi sto loggando..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autenticazione riuscita"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Non sei parcheggiato in nessuna stazione !"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "La Stazione non ha niente !"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "La Stazione non ha un Market !"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Sto raccogliendo i dati..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Nessun dato sul commandante"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Chi sei ?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Dove sei finito ?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Stai volando ?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Errore nel server Frontier CAPI"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Ultimo aggiornamento alle %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Cacciatore"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Artigliere"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Timoniere"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "disponibile tra {SS} secondi"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Spegnimento..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o più dei tuoi plugin non ha ancora il supporto per Python 3.x. Per favore guarda la lista '{PLUGINS}' nella tab a '{FILE}' > '{SETTINGS}'. Dovresti controllare se ci sono aggiornamenti, altrimenti avvisa gli sviluppatori che devono aggiornare il codice a Python 3.x.\n\nPuoi disabilitare il plugin rinominando la cartella aggiungendo '{DISABLED}' alla fine del nome."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins senza Supporto Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -168,7 +160,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignora"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Predefinito"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -195,410 +187,407 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Elaborazione di EDDB Journal disabilitata. Guarda il Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Sto inviando i dati a EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Errore: Non riesco a connettermi a EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Manda i dati della stazione a Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Manda il sistema e i dati scansionati a EDDN"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Ritarda l'invio fino a che si è ormeggiati"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Manda il flight log e lo stato Cmdr a EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Credenziali per Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Nome Commandante"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nessuna"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Errore: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Errore: Non riesco a connettermi a EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Manda il flight log e lo stato Cmdr a Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Credenziali per Inara"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara disabilitato. Vedi il Log."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Errore: il server Frontier ha un problema SKU"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Errore: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Preferenze"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Si prega di scegliere che dati salvare"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Market data in formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Market data in formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Equipaggiamento della nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Auto-aggiornamento all'ormeggio"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Percorso del file"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Cambia..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Sfoglia..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Output"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "locazione del file E:D journal"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Scorciatoia di tastiera"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Riavvia {APP} per usare le scorciatoie"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} ha bisogno dei permessi per usare le scorciatoie"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Apri Preferenze di Sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Solo quando “Elite: Dangerous” è in primo piano"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Notifica sonora"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Disabilita gli aggiornamenti automatici quando sei in-game"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Sito web preferito"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Spazioporto"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Usare metodo URL alternativo"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Livello di Log"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Configurazione"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Dati personali"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Testo normale"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Testo evidenziato"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Lingua"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Scuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Trasparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Percentuale zoom della UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Default{CR}Riavvio Richiesto per{CR}applicare i cambiamenti!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Trasparenza della finestra principale"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 stà per completamente opaco.{CR}Finestra è aggiornata in tempo reale"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Aspetto"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Cartella dei plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Apri"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Suggerimento: è possibile disabilitare un plugin {CR}aggiungendo '{EXT}' nel nome della sua cartella"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Plugin abilitati"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Plugin senza il supporto a Python 3.x :"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informazioni sulla migrazione dei plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Plugin disabilitati"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Prestito"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federazione"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Impero"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Riduci a icona nel Vassoio di sistema"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Valore"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Navi"; diff --git a/L10n/ja.strings b/L10n/ja.strings index 2309d7aa..9fce4e1f 100644 --- a/L10n/ja.strings +++ b/L10n/ja.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "確認"; /* Language name */ "!Language" = "日本語"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "エラー: Frontier CAPIからの応答がありません"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "エラー: Frontier社のサーバがダウンしています"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "エラー: Frontier社のサーバが混雑しています"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "不明なステーションに着艦: EDOの基地?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "エラー: 認証情報に誤りがあります"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "エラー: 不適切なCmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "エラー"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "エラー: Inaraに接続できません"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "エラー: customer_idトークンを確認できませんでした"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "エラー: customer_idがマッチしません!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "エラー: トークンが取得できません"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "Frontier CAPIがメンテナンスのため停止中"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Frontier CAPIクエリ失敗"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Frontier CAPIサーバエラー"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "更新"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "常に最前面に表示する"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "不明"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "エラー: E:Dジャーナルファイルの場所を確認してください"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "コマンダー"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "役割"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "船"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "スーツ"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "ステーション"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "ファイル"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "編集"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "表示"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "ウィンドウ"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "ヘルプ"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "{APP} について"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "更新の確認..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "生データの保存..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "ステータス"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "プライバシーポリシー"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "リリースノート"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "設定"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "終了"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "ドキュメント"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "コピー"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "ログイン中..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "認証成功"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "ステーションにドッキングしていません!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "このステーションには何も商品がありません!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "このステーションには市場がありません!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "CAPIクエリ中止: CMDR名が不明"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "CAPIクエリ中止: ゲームモードが不明"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "CAPIクエリ中止: 現システムが不明"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "CAPIクエリ中止: 他の船でマルチクルー中"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "CAPIクエリ中止: CQC(Arena)が検出"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "データを取得中..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: コマンダーのデータが返ってきませんでした"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "どなたですか?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "どこにいますか?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "どの船で飛行していますか?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Frontier CAPIサーバエラー"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "最終更新時間 %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "次回更新まであと {SS}秒"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "了解"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "終了します..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "有効にしている1つ以上のプラグインがPython 3.xをサポートしていません。'{FILE}' > '{SETTINGS}'\nメニューで表示される設定ダイアログの'{PLUGINS}' タブの一覧を確認してください。更新済みのバージョンがあるかを確認し、なければ開発者にPython 3.xに対応するように開発者に連絡してください。\n\nプラグインを無効にするにはフォルダ名の最後に'{DISABLED}'を追加してください。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "プラグイン"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: プラグインがPython 3.xをサポートしていません"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "無視"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "デフォルト"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDBジャーナル処理が無効です。ログを確認してください。"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "EDDNにデータ送信中..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "エラー: EDDNに接続できません"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDNエラー: EDDNで使用するにはEDMCのバージョンが古すぎます。更新してください。"; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDNエラー: 検証に失敗しました(EDMCが古すぎる?)。ログを確認してください。"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "EDDNエラー: ステータスコード {STATUS} が返されました"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkにステーションデータを送信する"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkに星系やスキャンした星のデータを送信する"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "ドッキングするまでデータを送信しない"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "EDDNジャーナルハンドラーが無効です。ログを確認してください。"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "フライトログとCMDRステータスをEDSMへ送信する"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Mapの認証情報"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "コマンダー名"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "APIキー"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "設定なし"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "EDSMハンドラーが無効です。ログを確認してください。"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "エラー: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "エラー: EDSMに接続できません"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "フライトログとCMDRステータスをInaraへ送信する"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara認証情報"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inaraが無効です。ログを確認してください。"; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "エラー: Frontier社のサーバで非ゲーム所有者と判断されました"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "エラー: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "環境設定"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "保存するデータの種類を選択して下さい"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "市場データをCSV形式で記録する"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "市場データをTrade Dangerous形式で記録する"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "船の装備構成"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "ドッキングした際に自動でデータを更新する"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "ファイルの出力先"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "変更..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "参照..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "出力"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:Dゲームクライアントのジャーナルファイル出力先"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "ショートカット"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "ホットキー"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "ショートカットを利用するには {APP} を再起動してください"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} がショートカットを利用するには許可が必要です"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "システム環境設定を開く"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Elite: Dangerousがアクティブの時だけ有効"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "音を鳴らす"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "ゲーム中の自動アプリケーション更新チェックを無効にする"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "お気に入りのウェブサイト"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "造船所"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "別のURL方式を使用する"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "ログレベル"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "環境設定"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "メインUIプライバシーオプション"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "UIでプライベートグループ名を表示しない"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "マルチクルー船長名を表示しない"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "プライバシー"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "通常表示"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "強調表示"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "言語"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "テーマ"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "ダーク"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "透明"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "UIスケール比率"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100はデフォルトを意味します{CR}変更した値を反映するには{CR}再起動が必要です!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "メインウィンドウの透明度"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100は完全に不透明であることを意味します。{CR}ウィンドウはリアルタイムで更新されます"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "表示"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "プラグインフォルダ"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "開く"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "ヒント: プラグインを無効にするには{CR}フォルダ名に '{EXT}' を追加してください"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "有効なプラグイン"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Python 3.xサポートのないプラグイン:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "プラグインの移行に関する情報"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "無効なプラグイン"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "口座残高"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "負債"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "戦闘ランク"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "交易ランク"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "探索ランク"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQCランク"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "連邦ランク"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "帝国ランク"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "パワープレイ"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "システムトレイに最小化する"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "状態: あなたのコマンダー名が不明です"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "状態: CAPIデータがありません"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "価値"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "所有船"; diff --git a/L10n/ko.strings b/L10n/ko.strings index 83d84d28..78f03306 100644 --- a/L10n/ko.strings +++ b/L10n/ko.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "확인"; /* Language name */ "!Language" = "한국어(Korean)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "오류: Frontier CAPI가 응답이 없음"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "오류: Frontier 서버 CAPI 연결 불가"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "오류: Frontier 서버 응답이 지연되고 있음"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ -"Docked but unknown station: EDO Settlement?" = "도킹되었지만 알 수 없는 정거장임: 엘리트: 데인저러스 오디세이의 지상 기지입니까? (의역이니 확인 바람)"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ +"Docked but unknown station: EDO Settlement?" = "알 수 없는 정거장에 도킹함: Odyssey 지상 기지입니까?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "오류: 잘못된 자격 증명"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "오류: 잘못된 커맨더"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "오류"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "오류: Inara에 연결할 수 없음"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "오류: customer_id 토큰을 확인할 수 없었음"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "오류: customer_id가 일치하지 않습니다!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "오류: 토큰을 받지 못함"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI 점검으로 접속 불가"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Frontier CAPI 쿼리 실패"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Frontier CAPI 서버 에러"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "새로 고침"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "항상 위에 보이기"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "알 수 없음"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ -"Error: Check E:D journal file location" = "에러: 엘리트:데인저러스 journal file 위치를 확인해 주십시요"; +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +"Error: Check E:D journal file location" = "오류: E:D 저널 파일의 위치를 확인하십시오"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "커맨더"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "함선"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "슈트"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "성계"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "스테이션"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "파일"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "편집"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "보기"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "창"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "도움말"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "{APP} 정보"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "업데이트 확인하기..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Raw 데이터 저장하기..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "상태"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "개인정보처리방침"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "릴리즈 노트"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "설정"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "종료"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "문서 자료"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "복사"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "로그인하는 중..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "인증 성공"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "스테이션에 도킹되어 있지 않습니다!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "스테이션에 아무것도 없습니다!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "스테이션에 마켓이 없습니다!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "CAPI 쿼리 중단: 커맨더 이름 알 수 없음"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "CAPI 쿼리 중단: 게임 모드 알 수 없음"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "CAPI 쿼리 중단: 현재 성계 알 수 없음"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "CAPI 쿼리 중단: 다른 함선의 멀티크루로 참여중"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "CAPI 쿼리 중단: CQC(아레나) 감지됨"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "데이터 가져오는 중..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: 커맨더 정보가 반환되지 않음"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "당신은 누구시죠?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "어디 계신거죠?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "지금 어떤 함선을 몰고 계신 건가요?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Frontier CAPI 서버 오류"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "마지막 업데이트: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "쿨다운 {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "종료하는 중..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "활성화된 플러그인 중 1개 이상이 Python 3.x를 지원하지 않습니다. '{FILE}' > '{SETTINGS}' 에서 '{PLUGINS}' 탭에 들어가 활성화되어있는 플러그인 목록을 확인하십시오. 플러그인들 중 새 버전이 나온 것이 있는지도 확인해보시고, 만약 3.x를 지원하지도, 새 버전도 없다면 해당 플러그인의 개발자에게 코드를 수정하기를 문의하십시오.\n\n플러그인을 비활성화하려면 '{DISABLED}'를 폴더명 뒤에 추가하면 됩니다."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "플러그인"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Python 3.x을 지원하지 않는 플러그인"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "무시하기"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "기본값"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB 저널 처리 비활성화됨. 로그 참고 바람."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "EDDN에 정보 전송하는 중..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "오류: EDDN에 연결할 수 없음"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 오류: EDMC 가 구버전 입니다. 업데이트 해주세요"; +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 오류: EDDN에 접속하기에 EDMC의 버전이 너무 오래되었습니다. 업데이트하시기 바랍니다."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 오류: 검증 실패 (EDMC 가 구버전입니까?). 로그 참고 바람"; +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 오류: 인증 실패 (EDMC가 너무 오래되었을 수 있음). 로그 참고"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "EDDN 오류: 상태 코드 {STATUS}가 반환됨"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 스테이션 정보 전송하기"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 시스템 및 스캔 정보 전송하기"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "도킹시까지 서버에 정보 전송을 미루기"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "EDDN 저널 처리 비활성화됨. 로그 참고 바람."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "EDSM에 flight 로그와 커맨더 상태 정보 전송하기"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map 계정"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "커맨더 이름"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API 키"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "없음"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "EDSM Handler 비활성화됨. 로그 참고 바람."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "오류: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "오류: EDSM에 연결할 수 없음"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Inara에 flight 로그와 커맨더 상태 정보 전송하기"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara 계정 정보"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara 비활성화됨. 로그 참고 바람."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "오류: Frontier 서버 SKU 문제 발생"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "오류: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "설정"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "어느 데이터를 저장할 지 선택해주세요"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "CSV 형식 파일의 마켓 정보"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Trade Dangerous 형식 파일의 마켓 정보"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "함선 피팅"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "도킹시 자동으로 서버에 정보 업데이트하기"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "파일 위치"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "바꾸기..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "찾아보기..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "출력"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D 저널(journal) 파일 위치"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "단축키 설정"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "단축키"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "단축키를 사용하려면 {APP}을(를) 다시 시작하십시오"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "단축기 사용을 위해선 {APP}이 권한 허용을 필요로 합니다"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "시스템 설정 열기"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Elite: Dangerous가 활성 창 상태일때만"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "소리 재생하기"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "게임이 실행중일 때 프로그램 업데이트 확인하지 않기"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "선호하는 사이트"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "쉽야드"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "다른 URL 형식 사용하기"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "로깅 수준"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "환경 설정"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "메인 UI 개인정보 설정"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "UI에서 프라이빗 그룹 이름 숨기가"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "멀티크루 함장 이름 숨기기"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "개인정보"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "일반 텍스트"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "강조된 텍스트"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "언어"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "테마"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "어둡게"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "투명하게"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "UI 스케일 백분율"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100은 '기본 설정'을 의미하며{CR}변경사항 적용을 위해{CR}재시작이 요구됩니다!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "메인 창 투명도"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100은 완전히 불투명함을 의미합니다.{CR}창은 실시간으로 업데이트됨"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "스타일"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "플러그인 폴더"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "열기"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "팁: 플러그인을 비활성화하려면{CR} '{EXT}'를 폴더명 뒤에 추가하면 됨"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "활성 플러그인"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Python 3.x을 지원하지 않는 플러그인:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "플러그인 위치 변경에 대한 정보"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "비활성 플러그인"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "잔고"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "대출"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federation"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "시스템 트레이로 최소화"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "상태: 아직 커맨더 이름이 확인되지 않음"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "상태: 아직 CAPI 정보 없음"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "가치"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "함선(들)"; diff --git a/L10n/lv.strings b/L10n/lv.strings index 788bb2be..2d32d179 100644 --- a/L10n/lv.strings +++ b/L10n/lv.strings @@ -1,482 +1,482 @@ /* Language name */ "!Language" = "Latviešu"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Kļūda: Frontier serveris nav aktīvs"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Kļūda: Frontier serveris aizkavējas"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Kļūda: Nederīga lietotāja informācija"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Atjaunināt"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Vienmēr virspusē"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Loma"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Kuģis"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistēma"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stacija"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Fails"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Labot"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Skats"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Logs"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Palīdzība"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Par {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Pārbaudīt atjauninājumus..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Saglabāt sākotnējos datus..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Statuss"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Privātuma politika"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Informācija par laidienu"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Iestatījumi"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Iziet"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentācija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopēt"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Autorizējas..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autentifikācija sekmīga"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Jūs neesat stacijā!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Stacijā nekā nav!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Stacijā nav tirgus!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Iegūst datus..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Kas tu esi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Kur tu esi?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Ar ko tu lido?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Pēdējo reizi atjaunināts %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Cīnītājs"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Ložmetējnieks"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Stūre"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Atskaite {SS}"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "Labi"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Spraudņi"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Noklusējuma"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Sūta datus uz EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Kļūda: Nevar savienoties ar EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Aizkavēt sūtīšanu līdz nosēšanai"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous zvaigžņu kartes informācija"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Komandiera vārds"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API atslēga"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Neviens"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Kļūda: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Kļūda: Nevar savienoties ar EDSM"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Iestatījumi"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Lūdzu izvēlaties kādus datus saglabāt"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Tirgus dati CSV formātā"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Tirgus dati Trade Dangerous formātā"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Kuģa loadout"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automtiski atjaunoties nosēžoties."; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Faila atrašanās vieta"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Mainīt..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Pārlūkot..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Izvade"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D žurnāla faila atrašanās vieta"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Ātrais taustiņš"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Ātrais taustiņš"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Restartējiet {APP} lai izmantotu īssceļus"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} vajag atļaujas lai izmantotu īssceļus"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Atvērt sistēmas iestatījumus"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Tikai kad Elite: Dangerous ir aktīvā aplikācija"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Atskaņot skaņu"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Kuģu būvētava"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfigurācija"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privātums"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normālais teksts"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Izceltais teksts"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Valoda"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Dizains"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Tumša"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Caurspīdīga"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Izskats"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Spraudņu mape"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Atvērt"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Iespējoti Spraudņi"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Atspējoti Spraudņi"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Bilance"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Aizdevums"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federation"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Nekaitīgs"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Bezpalīdzīgs"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Varonis"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiators"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Leitnants"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Bruņinieks"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Karalis"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Vērtība"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Kuģi"; diff --git a/L10n/nl.strings b/L10n/nl.strings index 0373f228..8aa3006b 100644 --- a/L10n/nl.strings +++ b/L10n/nl.strings @@ -1,524 +1,518 @@ /* Language name */ "!Language" = "Nederlands"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Fout: Frontier server is offline"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Fout: Frontier server is vertraagd"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Fout: Ongeldige inlog gegevens"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Fout: Verkeerde Cmdr"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Fout: Kan geen verbinding maken met Inara"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Bijwerken"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Altijd op voorgrond"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Schip"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Systeem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Bestand"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Bewerken"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Beeld"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Venster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Help"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Over {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Controleren op updates..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Sla onbewerkte gegevens op..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Privacybeleid"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Release opmerkingen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Instellingen"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Afsluiten"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Documentatie"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopieëren"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Bezig met inloggen..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Authenticatie voltooid"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Je bent niet gedockt in een station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Station heeft helemaal niets!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Station heeft geen markt!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Data wordt opgehaald..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Wie ben je?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Waar ben je?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Waar vlieg je in?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Voor het laatst bijgewerkt om %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Gevechtsvlieger"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Schutter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Stuurman"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "wachtperiode {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Een of meer ingeschakelde plugins hebben nog geen Python 3.x ondersteuning. Kijk op de lijst op de '{PLUGINS}' tab van '{FILE}' > '{SETTINGS}'. Check of er een bijgewerkte versie beschikbaar is. Laat anders de developer weten dat ze de code moeten updaten voor Python 3.x.\n\nJe kan de plugin uitschakelen door het mapje te hernoemen met '{DISABLED}' aan het eind van de naam."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMS: Plugins zonder Python 3.x ondersteuning"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Standaard"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Bezig data te versturen naar EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Fout: Kan geen verbinding maken met EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Stuur station gegevens naar het Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Stuur systeem en scan gegevens naar het Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Stel verzending uit tot na het docken"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Stuur vlucht logboek en Cmdr status naar EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map inlog gegevens"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Commander naam"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Geen"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Fout: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Fout: Kan geen verbinding maken met EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Stuur vlucht logboek en Cmdr status naar Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara inlog gegevens"; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Fout: Frontier server SKU probleem"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Fout: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Preferences"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Welke gegevens wilt u opslaan?"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Markt data in CSV bestand formaat"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Markt data in Trade Dangerous bestand formaat"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Schip inrichting"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automatisch bijwerken na de landing"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Bestand locatie"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Wijzigen..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Bladeren..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Uitvoer"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D journaal bestand locatie"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Toetscombinaties"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "{APP} heropstarten om toetscombinaties te gebruiken"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} heeft toestemming nodig om toetscombinaties te gebruiken"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Open Systeemvoorkeuren"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Alleen wanneer Elite: Dangerous de actieve applicatie is"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Geluid afspelen"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Schakel Automatische update check uit wanneer in-game"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Voorkeur websites"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Scheepswerf"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Gebruik andere URL methode"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Configuratie"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privacy"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normale tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Gemarkeerde tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Taal"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Thema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Donker"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparent"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Vormgeving"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Plugins map"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Openen"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: Je kan een plugin deactiveren door '{EXT}'{CR}toe te voegen aan de map naam"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Geactiveerde plugins"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informatie over plugins migreren"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Gedeactiveerde plugins"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Balans"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Lening"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Gevechts rang"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Handels rang"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Ontdekkingsreiziger rang"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federation"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Waarde"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Schepen"; diff --git a/L10n/pl.strings b/L10n/pl.strings index 06e2eb11..9d6d9a2c 100644 --- a/L10n/pl.strings +++ b/L10n/pl.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Sprawdź"; /* Language name */ "!Language" = "Polski"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Błąd: Brak odpowiedzi od CAPI Frontier"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Błąd: Serwer Frontiera nie odpowiada"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Błąd: Serwer Frontiera laguje"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Zadokowany na nieznanej stacji: czyżby kolonia EDO?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Błąd: Dane uwierzytelniające niepoprawne"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Błąd: Niepoprawny Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Błąd"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Błąd: Nie można połączyć się z serwisem Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Błąd: Nie można sprawdzić ID klienta z tokenu"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Błąd: ID klienta nie pasuje!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Błąd: Nie można pobrać tokenu"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "CAPI w trakcie prac serwisowych"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Błąd zapytania CAPI Frontier"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Błąd serwera CAPI Frontier"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Aktualizacja"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Zawsze na wierzchu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Nieznany"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Błąd: Sprawdź lokalizację pliku dziennika E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Rola"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Statek"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Kombinezon"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stacja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Plik"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Edycja"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Widok"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Pomoc"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "{APP}..."; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Sprawdź aktualizacje..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Zapisz Nieprzetworzone Dane..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Polityka prywatności"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Informacje o wersji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Ustawienia"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Zakończ"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentacja"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiuj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Logowanie..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autoryzacja pomyślna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Nie jesteś zadokowany do stacji!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Stacja jest pusta!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "W stacji nie ma giełdy towarowej!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "Zapytanie CAPI anulowane: nazwa komandora nieznana"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "Zapytanie CAPI anulowane: tryb gry nieznany"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "Zapytanie CAPI anulowane: obecny system nieznany"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "Zapytanie CAPI anulowane: jako załogant w innym statku"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "Zapytanie CAPI anulowane: wykryto arenę CQC"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Pobieranie danych..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Nie zwrócono danych dowódcy"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Kim jesteś?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Gdzie jesteś?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Czym latasz?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Błąd serwera CAPI Frontier"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Ostatnia aktualizacja %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Oczekiwanie {SS} sek."; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Wyłączanie..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Co najmniej jeden z uruchomionych pluginów nie wspiera Python 3.x. Sprawdź listę w '{FILE}' > '{SETTINGS}', sekcja '{PLUGINS}'. Upewnij się, że dostępna jest aktualna wersja pluginu, w przeciwnym razie poinformuj twórcę, że należy zaktualizować kod do wersji Python 3.x.\n\nMożesz wyłączyć plugin, dodając '{DISABLED}' na koniec nazwy jego folderu."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy Nie Wspierające Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Zignoruj"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Domyślne"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Wyłączone przetwarzanie dziennika EDDB. Sprawdź logi."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Wysłanie danych do EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Błąd: Brak połączenia z EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Błąd EDDN: Zbyt stara wersja EDMC. Zaktualizuj do nowszej wersji."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Błąd EDDN: Nieudana weryfikacja (stara wersja EDDN?). Sprawdź logi."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "Błąd EDDN: Zwrócono kod {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Wyślij dane do Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Wyślij dane skanowań do EDDN"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Czekaj z wysłaniem na zadokowanie"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "Wyłączona obsługa dziennika EDDB. Sprawdź logi."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Wyślij zapis lotu i status pilota do EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Dane uwierzytelniające Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Commander Name"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Klucz API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Brak"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "Wyłączona obsługa EDDB. Sprawdź logi."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Błąd: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Błąd: Brak połączenia z EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Wyślij zapis lotu i status pilota do Inary"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara - uprawnienia"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara jest wyłączona. Sprawdź logi."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Błąd w odpowiedzi serwera autoryzacyjnego."; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Błąd: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Preferencje"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Jakie dane zapisywać"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Dane rynkowe w formacie CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Dane rynkowe w formacie Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Wyposażenie statku"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Aktualizuj automatycznie po zadokowaniu"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Położenie pliku"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Zmień..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Przeglądaj..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Wyjście"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D Lokacja pliku dziennika"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Skrót klawiaturowy"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Skr. Klaw."; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Zrestartuj {APP} by użyć{CR}skrótu klawiszowego."; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} wymaga uprawnień by{CR}móc korzystać ze skrótów klawiszowych."; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Otwórz Preferencje systemowe"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Tylko gdy Elite: Dangerous jest aplikacją aktywną"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Odtwórz dźwięk"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Wyłącz automatyczne wyszukiwanie aktualizacji, gdy jesteś w grze"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Preferowane strony"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Stocznia"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Użyj alternatywnej metody URL"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Poziom logowania"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfiguracja"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Opcje prywatności UI"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Ukruj nazwę grupy prywatnej w UI"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Ukryj nazwę kapitana w \"multi-crew\""; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Prywatność"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Zwykły tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Podświetlony tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Język"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Schemat kolorystyczny"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Ciemny"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Przezroczyste"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Skalowanie UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 oznacza wartość domyślną{CR}Zmiany zostaną wprowadzone po{CR}ponownym uruchomieniu programu!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Przeźroczystość okna głównego"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 oznacza nieprzeźroczyste.{CR}Okno aktualizowane w czasie rzeczywistym."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Wygląd"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Folder pluginów"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Otwórz"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Wskazówka: Możesz wyłączyć pluginy{CR}dodając '{EXT}' do nazwy folderu"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Włączone pluginy"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Pluginy nie obsługiwane przez Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informacja o migracji pluginów"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Pluginy wyłączone"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Pożyczka"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federacja"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Imperium"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Zminimalizuj do zasobnika systemowego"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Ocena 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Ocena 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Ocena 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Ocena 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Ocena 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Status: Nieznana nazwa komandora"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Status: Brak danych CAPI"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Wartość"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Statki"; diff --git a/L10n/pt-BR.strings b/L10n/pt-BR.strings index 659bce41..f7bf8702 100644 --- a/L10n/pt-BR.strings +++ b/L10n/pt-BR.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Verificar"; /* Language name */ "!Language" = "Português (Brasil)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Erro: o CAPI da Frontier não respondeu"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Erro: O servidor da Frontier está offline"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Erro: O servidor da Frontier está com lag"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Docado, mas estação desconhecida: assentamento Odyssey?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Erro: Cmdt Errado"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Erro"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Erro: Não é possível conectar-se a Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Erro: não foi possível verificar o token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Erro: customer_id diferente!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Erro: não foi possível obter o token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "CAPI da Frontier indisponível por manutenção"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Falha na requisição ao CAPI da Frontier"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Erro de servidor do CAPI da Frontier"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Atualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Sempre no topo"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Desconhecido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Erro: Verifique a localicação dos arquivos de Jornais E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Arquivo"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Visualizar"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Janela"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Ajuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Sobre {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Verificar por Atualizações..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Salvar dados brutos..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Política de Privacidade"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Notas de atualização"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Configurações"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Sair"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Efetuando login..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autenticação bem-sucedida"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Você não está docado na estação!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "A estação não tem nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "A estação não tem um mercado!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "Requisição CAPI cancelada: nome de CMDT desconhecido"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "Requisição CAPI cancelada: modo de jogo desconhecido"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "Requisição CAPI cancelada: sistema atual desconhecido"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "Requisição CAPI cancelada: em multi-crew em outra nave"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "Requisição CAPI cancelada: CQC (Arena) detectado"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Nenhum dado de comandante retornado"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Quem é você?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Onde está você?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "No que você está voando?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Erro de servidor do CAPI da Frontier"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Última atualização %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Caça"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Artilheiro"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Comando"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "aguarde {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Encerrando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins habilitados não possuem suporte ao Python 3.x. Você pode ver a lista na guia '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Você deve verificar se existe versão atualizada ou então avisar o desenvolvedor de que ele precisa atualizar o código para o Python 3.x.\n\nVocê pode desabilitar um plugin renomeando sua pasta para que seu nome termine com '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem Suporte ao Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorar"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Padrão"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Processamento de Jornais no EDDB desativado. Verifique o Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Enviando log para o EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Erro: Não é possível conectar-se ao EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: o EDMC é muito antigo para o EDDN. Por favor, atualize."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (EDMC antigo?). Verifique o log."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "Erro EDDN: retornou o código {STATUS}."; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Enviar log da estação para o EDDN"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Enviar sistemas e dados escaneados para o EDDN"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Atrasar o envio até estar docado"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "Manipulador de Jornais do EDDN desativado. Verique o Log."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Enviar dados de voo e status do cmdt para o EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Credenciais do Elite Dangerous Star Map (EDSM)"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Nome do Comandante"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Chave da API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nenhum"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "Manipulador do EDSM desativado. Verifique o Log."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Erro: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Erro: Não é possível conectar-se ao EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Enviar dados de voo e status do cmdt para o Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Credenciais do Inara"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara desativado. Verifique o Log."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Erro: Problema de SKU no servidor da Frontier"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Erro: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Preferências"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Por favor, escolha quais dados para salvar"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Dados de mercado no arquivo de formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Dados de mercado no arquivo de formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Modulação da nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Atualizar automaticamente na docagem"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Localização do Arquivo"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Alterar..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Procurar..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Saída"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Localização dos arquivos de Jornais E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Atalho de teclado"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Tecla de atalho"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Reinicie o {APP} para usar os atalhos"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} precisa de permissão para usar atalhos"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Abrir preferências do sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Somente quando o Elite: Dangerous é o aplicativo ativo"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Tocar som"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Desativar Verificação Automática de Atualizações do EDMC enquanto jogo"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Website preferido"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Estaleiro"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Usar URL alternativa"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Nível de Log"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Configuração"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Opções de privacidade da IU"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Ocultar nome do grupo privado na IU"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Ocultar nome do capitão em multi-crew."; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privacidade"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Texto normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Texto destacado"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Idioma"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Escuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Porcentagem de escala da IU"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Padrão{CR}Necessário Reiniciar para as{CR}alterações entrarem em vigor!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Transparência da janela principal"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 significa totalmente opaco.{CR}A janela é atualizada em tempo real."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Aparência"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Pasta dos plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Abrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Dica: Você pode desativar um plugin{CR}adicionando '{EXT}' ao nome da pasta"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Plugins Habilitados"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Plugins sem suporte a Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informações de migração de plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Plugins desabilitados"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Balanço"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Empréstimo"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combate"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Comércio"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Exploração"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federação"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Império"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Poderes da galáxia"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Inofensivo"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Quase Inofensivo"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novato"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competente"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Experiente"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Mestre"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Perigoso"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Letal"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Pobre"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Quase pobre"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Camelô"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Negociante"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Mercador"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Corretor"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Empresário"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Magnata"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Perdido"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Minimizar para a área de notificação"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Quase perdido"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Explorador"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Cartógrafo"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Desbravador"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Descobridor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Patrulheiro"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneiro"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Indefeso"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Quase Indefeso"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amador"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi-profissional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Profissional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Campeão"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Herói"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiador"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruta"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Aspirante"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Cabo"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Terceiro-Sargento"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Segundo-Sargento"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Primeiro-Sargento"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Suboficial"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Tenente"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Tenente Comandante"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Capitão de Corveta"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Capitão de Fragata"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Contra-Almirante"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice-Almirante"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Almirante"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Forasteiro"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Servo"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Escudeiro"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Cavaleiro"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lorde"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Barão"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Visconde"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Conde"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Marquês"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Duque"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Arqui-Duque"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Príncipe"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Rei"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Nível 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Nível 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Nível 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Nível 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Nível 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Status: Nome de CMDT ainda desconhecido"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Status: ainda sem dados CAPI"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Valor"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Naves"; diff --git a/L10n/pt-PT.strings b/L10n/pt-PT.strings index 8f283d90..715369ef 100644 --- a/L10n/pt-PT.strings +++ b/L10n/pt-PT.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Verificar"; /* Language name */ "!Language" = "Português (Portugal)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Erro: CAPI da Frontier não respondeu."; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Erro: O servidor da Frontier está offline"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Erro: O servidor da Frontier está atrasado"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Atracado numa estação desconhecida. É uma colónia EDO?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Erro: Cmdt errado"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Erro"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Erro: Não é possível conectar ao Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Erro: Impossível verificar o token de customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Erro: customer_id não foi encontrado!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Erro: Não é possível obter o token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "CAPI da Frontier em manutenção."; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Falha ao consultar a CAPI da Frontier."; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Erro do servidor CAPI da Frontier."; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Actualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Sempre por cima"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Desconhecido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Erro: Verifique a localização do ficheiro do diário E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Fato"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Ficheiro"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Ver"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Janela"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Ajuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Sobre {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Procurar por Actualizações..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Salvar dados em bruto..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Estado"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Política de Privacidade"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Notas da Versão"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Definições"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Sair"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Realizando login..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autenticação bem-sucedida"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Não está atracado numa Estação"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "A Estação não tem nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "A Estação não possui um mercado!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "Consulta à CAPI abortada: Nome do Comandante desconhecido"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "Consulta à CAPI abortada: Modo de Jogo desconhecido"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "Consulta à CAPI abortada: Sistema actual desconhecido"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "Consulta à CAPI abortada: Jogador em multi-tripulação noutra nave."; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "Consulta à CAPI abortada: CQC (Arena) detectada."; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Dados do Comandante não recebidos"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Quem é você?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Onde é que está?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "No que é que está a voar?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Erro do servidor CAPI da Frontier."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Última actualização: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Caça"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Artilheiro"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Comando"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "aguarde {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "A Desligar..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins activados não possui ainda suporte para Python 3.x. Por favor verifique a lista na aba '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Deverá verificar se está disponível uma versão mais actualizada, caso contrário, informe o desenvolvedor de que necessita de actualizar o código para suportar Python 3.x.\n\nPode desactivar um plugin colocando '{DISABLED}' no fim do nome da pasta correspondente."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem suporte para Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorar"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Predefinido"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Processamento do diário do EDDB desactivado. Verifique o ficheiro de registos."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "A enviar dados para o EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Erro: Não é possível conectar ao EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: Versão do EDMC é demasiado antiga para usar com a EDDN. Por favor actualize."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (Versão do EDMC demasiado antiga?). Verifique os ficheiros de registo."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "Erro EDDN: Recebido código de estado {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Enviar dados da estação para o Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Envia dados do Sistema e Scans efectuados para o Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Atrasar o envio até estar atracado"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "Gestor do diário do EDDN desactivado. Verifique o ficheiro de registos."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Enviar dados de voo e o estado do CMDT para o EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Credenciais do Elite Dangerous Star Map (EDSM)"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Nome do Comandante"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Chave API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nenhum"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "Gestor do EDSM desactivado. Verifique o ficheiro de registos."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Erro: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Erro: Não é possível conectar ao EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Enviar dados de voo e o estado do CMDT para o Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Credenciais Inara"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara desactivado. Verifique o ficheiro de registos."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Erro: Problema de SKU no servidor da Frontier"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Erro: Inara: {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Preferências"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Por favor escolher quais os dados a guardar"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Ficheiro dos dados de Mercado no formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Ficheiro dos dados de Mercado no formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Módulos da nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Actualizar automaticamente ao atracar"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Localização do Ficheiro"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Alterar..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Procurar..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Saída"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Localização do ficheiro do diário E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Atalho de Teclado"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Tecla Rápida"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Reinicie o {APP} para usar os atalhos"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "A {APP} precisa de autorização para usar atalhos"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Abrir Preferências do Sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Apenas quando o Elite:Dangerous é a aplicação activa"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Reproduzir som"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Desactivar Verificação de Updates Automáticos da Aplicação enquanto joga"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Websites preferidos"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Estaleiro"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Usar método URL alternativo."; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Nível de Log"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Configuração"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Opções Privacidade UI principal"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Esconder nome do grupo privado na UI"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Esconder nome de capitão em multi-tripulação."; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privacidade"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Texto normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Texto destacado"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Linguagem"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Escuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Percentagem da escala de UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Predefinido{CR}Requer reinício para{CR}que as mudanças façam efeito!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Transparência da janela principal"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 é completamente opaco.{CR}A janela é actualizada em tempo real."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Aparência"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Pasta dos Plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Abrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Dica: Pode desactivar um plugin{CR}ao adicionar '{EXT}' ao nome da sua pasta"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Plugins Activados"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Plugins sem suporte para Python 3.x"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informação para migração de plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Plugins Desactivados"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Balanço"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Empréstimo"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combate"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Comércio"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Exploração"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federação"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Império"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Jogos de Poder"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Inofensivo"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Praticamente Inofensivo"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novato"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competente"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Perito"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Mestre"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Perigoso"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Mortal"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Falido"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Praticamente Pobre"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Vendedor"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Negociante"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Mercador"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Corretor"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Empreendedor"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Magnata"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Sem Destino"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Minimizar para a barra de tarefas"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Quase sem destino"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Batedor"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Cartógrafo"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Guia"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Descobridor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Patrulheiro"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneiro"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Indefeso"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Praticamente Indefeso"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amador"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Profissional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Profissional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Campeão"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Herói"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiador"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruta"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadete"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Aspirante"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Subsargento"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Segundo-Sargento"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Sargento-mor"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Subtenente"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Tenente"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Capitão-tenente"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Tenente de Fragata"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Capitão de Fragata"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Contra-Almirante"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice-Almirante"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Almirante"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Forasteiro"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Servo"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Escudeiro"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Cavaleiro"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lorde"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Barão"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Visconde"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Conde"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquês"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duque"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Príncipe"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Rei"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Nível 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Nível 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Nível 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Nível 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Nível 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Estado: Nome de Comandante ainda desconhecido."; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Estado: Ainda sem dados CAPI"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Valor"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Naves"; diff --git a/L10n/ru.strings b/L10n/ru.strings index d968a85d..0b025a6a 100644 --- a/L10n/ru.strings +++ b/L10n/ru.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Проверка"; /* Language name */ "!Language" = "Русский"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Ошибка: CAPI Frontier не отвечает"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Ошибка: сервера Frontier недоступны"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Ошибка: сервера Frontier нестабильны"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Неизвестный тип станции: поселение EDO?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Ошибка: неизвестное имя пользователя или неверный пароль"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Ошибка: неверное имя командира"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Ошибка"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Ошибка: не удается подключиться к Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Ошибка: невозможно проверить токен customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Ошибка: customer_id не совпадает!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Ошибка: не удается получить токен"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI остановлен для технического обслуживания"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Неудача при запросе к Frontier CAPI"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Серверная ошибка Frontier CAPI"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Обновить данные"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Поверх остальных окон"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Неизвестно"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Ошибка: проверьте расположение журналов E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "КМДР"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Роль"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Корабль"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Станция"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Файл"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Правка"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Вид"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Окно"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Дополнительно"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "О программе {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Проверить наличие обновлений..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Сохранить \"сырые\" данные.."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Статус"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Политика конфиденциальности"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Заметки о текущем релизе"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Настройки"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Выход"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Информация о плагине"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Копировать"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Идет подключение..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Аутентификация успешно завершена"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Ваш корабль не пристыкован к станции!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "На текущей станции никакие услуги не предоставляются!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "На текущей станции рынок недоступен!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "Запрос CAPI прерван: Имя командира неизвестно"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "Запрос CAPI прерван: Игровой режим неизвестен"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "Запрос CAPI прерван: Текущая система неизвестна"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "Запрос CAPI прерван: В мультиэкипаже другого корабля"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "Запрос CAPI прерван: Обнаружен CQC (Арена)"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Получение данных..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Нет данных пилота"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Невозможно определить личность командира!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Невозможно определить местоположение!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Невозможно определить тип корабля!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Серверная ошибка Frontier CAPI"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Последнее обновление в %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Истребитель"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Стрелок"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Командир корабля"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "пауза {SS} сек"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Выключение..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один или несколько ваших подключённых плагинов ещё не имеют поддержки Python 3.x. Пожалуйста, ознакомьтесь со списком во вкладке '{PLUGINS}' '{FILE}' > '{SETTINGS}'. Вы должны проверить наличие обновлённой версии, в противном случае предупредите разработчика о необходимости обновления кода на Python 3.x.\n\nВы можете отключить плагин, переименовав его папку в '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Плагины"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Без поддержки Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Игнорировать"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "По умолчанию"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Обработка журнала EDDB отключена. См. логи."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Отправка данных на EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Ошибка: не удается подключиться к EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Ошибка EDDN: старая версия EDMC, обновитесь до последней."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Ошибка EDDN: Неудачная валидация (старая версия EDMC?). См. логи."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "Ошибка EDDN: Возвращён статус код {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Отправлять информацию о станциях на Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Отправлять данные о системе и данные сканирования в Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Отложить отправку данных до завершения стыковки"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "Обработчик журнала EDDN отключен. См. логи."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Отправлять данные журнала полёта и информацию статусе командира в EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Учётные данные Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Имя командира"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Ключ API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Не назначено"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "Обработчик журнала EDSM отключен. См. логи."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Ошибка: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Ошибка: не удается подключиться к EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Отправлять данные журнала полёта и информацию статусе командира в Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Учётные данные Inara"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara отключена. См. логи."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Ошибка: проблема с сервером аутентификации Frontier"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Ошибка: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Настройки"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Выберите какие данные стоит сохранять"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Данные рынков в формате CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Данные рынков в формате Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Оборудование корабля"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Автоматически обновлять данные при стыковке"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Путь хранения файлов"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Обзор..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Просмотреть..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Данные"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Расположение файла журнала E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Сочетание клавиш"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Горячая клавиша"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Перезапустите {APP}, чтобы использовать сочетание клавиш"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} требуется разрешение на использование глобальных сочетаний клавиш"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Открыты «Настройки системы»"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Только когда окно Elite: Dangerous активно"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Звуковое оповещение"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Отключить автоматическое обновление приложения во время нахождения в игре"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Предпочитаемые сайты"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Верфи"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Альтернативный URL (адрес)"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Уровень лога"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Конфигурация"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Настройки приватности главного окна"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Скрывать название приватной группы в главном окне"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Скрывать ник капитана мультикрю сессии в главном окне"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Конфиденциальность"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Обычный текст"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Выделенный текст"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Язык"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Тема оформления"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Тёмная"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Прозрачная"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Процент масштабирования интерфейса"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 - значение по умолчанию{CR}требуется перезапуск для вступления в силу изменений{CR}!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Прозрачность главного окна"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 означает полностью непрозрачный.{CR}Окно обновляется в режиме реального времени."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Внешний вид"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Папка плагинов"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Открыть"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Подсказка: Отключить конкретный плагин можно {CR} добавив '{EXT}' к названию папки"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Включённые плагины"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Плагины без поддержки Python 3.x"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Информация о мигрирующих плагинах"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Отключенные плагины"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Баланс"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Долг"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Боевой"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Торговый"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Исследовательский"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Федерация"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Империя"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Ранг у галактических держав"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Безвредный"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "В целом безвредный"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Новичок"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Специалист"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Эксперт"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Мастер"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Опасный"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Смертоносный"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Элита"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Нищий"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Полунищий"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Мелкий торговец"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Агент"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Коммерсант"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Брокер"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Предприниматель"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Магнат"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Бесцельный"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Сворачивать в системный трей"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Почти бесцельный"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Разведчик"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Изыскатель"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Путешественник"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Следопыт"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Скиталец"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Первооткрыватель"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Беспомощный"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Почти беспомощный"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Любитель"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Полупрофессионал"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Профессионал"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Чемпион"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Герой"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Гладиатор"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Новобранец"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Кадет"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Гардемарин"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Старшина"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Главный старшина"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Уорент-офицер"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Энсин"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Лейтенант"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Капитан-лейтенант"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Начальник гарнизона"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Командир корабля"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Контр-адмирал"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Вице-адмирал"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Адмирал"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Чужак"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Крепостной"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Оруженосец"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Рыцарь"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Лорд"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Барон"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Виконт"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Граф"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Эрл"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Маркиз"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Герцог"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Принц"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Король"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Ранг 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Ранг 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Ранг 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Ранг 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Ранг 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Статус: На текущий момент имя командира неизвестно"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Статус: На текущий момент данные CAPI отсутствуют"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Стоимость"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Корабли"; diff --git a/L10n/sl.strings b/L10n/sl.strings index ae05d3af..503162ef 100644 --- a/L10n/sl.strings +++ b/L10n/sl.strings @@ -1,431 +1,434 @@ /* Language name */ "!Language" = "Slovenščina"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Napaka: napačno uporabniški ime ali geslo"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Osveži"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Vedno na vrhu"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Vloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Ladja"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Postaja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Datoteka"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Uredi"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Pomoč"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Preveri posodobitve..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Shrani Izvirne Podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Pravilnik o zasebnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Opombe ob izdaji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Nastavitve"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Izhod"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Prijava v teku... "; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Preverjanje pristnosti je bilo uspešno"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Nahajš se v postaji!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Postaja nima ničesar"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Postaja nima trga"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Nalagam podatke..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Kdo si"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Kje se nahajaš"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "S čim letiš"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Zadnja osvežitev podatkov %H:%M:%S "; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Posodobitev v {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "Potrdi"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Privzeta"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Pošiljam podatke na EDDN"; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Napaka: povezava z EDDN ni mogoča"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Pošlji podatke postaje na EDDN"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "EDStarMap uporabniški podatki"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Commander ime"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API ključ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Brez"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Napaka: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Napaka: Povezava z EDSM ni mogoča"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Nastavitve"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Izberite podatke, ki jih želite shraniti"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Podatki trga v CSV formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Podatki trga v Trade Dangerous formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Oprema ladje"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Lokacija datoteke"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Spremeni..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Prebrskaj..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Izpis"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Bližnjica"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Bližnjica"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Ponovno poženi {APP} za uporabo bližnjic"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} potrebuje dovoljenja za uporabo bližnjic"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Odpri sistemske nastavitve"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Samo ko je Elite:Dangerous aktivna aplikacija "; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Sproži zvok"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfiguracija"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privatno"; + +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Jezik"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Temno"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Prosojno"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Videz"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Ravnotežje"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Posojilo"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trgovanje"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federacija"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Cesarstvo"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Igra moči"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Peniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly peniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Enterpreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "LIeutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Read Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serif"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Ocena 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Ocena 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Ocena 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Ocena 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Ocena 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Vrednost"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Ladje"; diff --git a/L10n/sr-Latn-BA.strings b/L10n/sr-Latn-BA.strings index bfbe94b4..ec854aef 100644 --- a/L10n/sr-Latn-BA.strings +++ b/L10n/sr-Latn-BA.strings @@ -1,180 +1,172 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Provjera"; /* Language name */ "!Language" = "Srpski (Latinica, Bosna i Hercegovina)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Greška: Frontier CAPI nije odgovorio"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Greška: Frontier server je nedostupan"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Greška: Frontier server je usporen"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Pristali ste, ali stanica je nepoznata: EDO naselje?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Greška: Neispravni kredencijali"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Greška"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Greška: Nemoguće povezivanje sa Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Greška: Nemoguća provjera tokena customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Greška: Nemoguće dobaviti token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Frontier CAPI neuspješan upit"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Frontier CAPI serverska greška"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Osvježi"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Uvijek na vrhu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Nepoznato"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Greška: Provjerite lokaciju E:D journal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Brod"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Odijelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Fajl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Uredi"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Prozor"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Pomoć"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Provjeri nadogradnje..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Politika privatnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Informacije o verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Podešavanja"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Izlaz"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Prijavljivanje..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autentifikacija uspješna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Niste pristali na stanicu"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Stanica nema ništa!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Stanica nema market!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Nema podataka o komandantu"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Ko ste vi?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Gdje se nalazite?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "U čemu letite?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Frontier CAPI serverska greška"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Posljednji put osvježeno %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "pauza {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Zatvaranje programa..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Provjerite da li postoji nadograđena verzija ili obavijesite autora da treba da promijeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +181,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignoriši"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Standardna"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +214,431 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB obrada journala je deaktivirana. Pogledajte Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Slanje podataka na EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje sa EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspjela (EDMC prestar?). Pogledajte log."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Statusni kod {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Odgodi slanje do pristajanja"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "EDDN obrada journala je deaktivirana. Pogledajte Log."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Pošalji log leta i Cmdr status na EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Kredencijali za Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Ime komandanta"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API ključ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nije definisano"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "EDSM obrada je deaktivirana. Pogledajte Log."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Greška: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Greška: Nemoguće povezivanje sa EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Pošalji log leta i Cmdr status na Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Kredencijali za Inara"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara je deaktivirana. Pogledajte Log."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Greška: SKU problem na Frontier serveru"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Greška: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Podešavanja"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Izaberite koji podaci se snimaju"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Fajl sa market podacima u CSV formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Fajl sa market podacima u Trade Dangerous formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Brodska oprema"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automatsko slanje nakon pristajanja"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Lokacija fajlova"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Promijeni..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Potraži..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Izvoz"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Lokacija E:D journal fajlova"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Prečica"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Prečica"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Restartujte {APP} da bi ste koristili prečice"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} traži dozvolu da koristi prečice"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Otvori sistemska podešavanja"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Samo kada je Elite: Dangerous aktivna aplikacija"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Zvučni efekat"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Isključi automatsku provjeru nadogradnji za vrijeme igranja"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Preferirani web sajtovi"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Brodogradilište"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Koristi alternativni URL metod"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Log nivo"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfiguracija"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Podešavanja privatnosti glavnog prozora"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Ne prikazuj naziv privatne grupe"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Ne prikazuj ime kapetana u višečlanoj posadi"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privatnost"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normalan tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Označeni tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Jezik"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Tamna"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Prozirna"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Procenat UI skaliranja"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 je standardna vrijednost{CR}Potreban je restart{CR}za primjenu podešavanja!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Prozirnost glavnog prozora"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 znači potpuno neprozirno.{CR}Prozor se osvježava u realnom vremenu"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Izgled"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Folder za dodatke (plugins)"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Otvori"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Savjet: Možete da deaktivirate dodatak (plugin){CR}dodavanjem '{EXT}' na ime njegovog foldera"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Aktivirani dodaci (plugins)"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Dodaci (plugins) bez Python 3.x podrške:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informacije o migraciji dodataka (plugins)"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Deaktivirani dodaci (plugins)"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Balans"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Zajam"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Borba (Combat)"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trgovina (Trade)"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federacija (Federation)"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Imperija (Empire)"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Minimiziranje u system tray"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Vrijednost"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Brodovi"; diff --git a/L10n/sr-Latn.strings b/L10n/sr-Latn.strings index 1e1f2b55..126b9dcf 100644 --- a/L10n/sr-Latn.strings +++ b/L10n/sr-Latn.strings @@ -1,180 +1,190 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "Provera"; /* Language name */ "!Language" = "Srpski (Latinica)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "Greška: Frontier CAPI nije odgovorio"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Greška: Frontier server je nedostupan"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Greška: Frontier server je usporen"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "Dokovan ali stanica nepoznata: EDO Naselje?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Greška: Pogrešni kredencijali"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Greška"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Greška: Nemoguće povezivanje na Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Greška: Nemoguća provera tokena customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Greška: nemoguće dobaviti token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI isključen radi održavanja"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "Greška pri Frontier CAPI upitu"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Greška na Frontier CAPI serveru"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Osveži"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Uvek na vrhu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Nepoznato"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "Greška: Proverite lokaciju E:D žurnal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Brod"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Odelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Fajl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Izmeni"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Prozor"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Pomoć"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Proveri da li postoje izmene..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Polisa o privatnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Informacije o ovoj verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Podešavanja"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Izlaz"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Prijavljivanje..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autentifikacija uspešna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Niste pristali na stanicu!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Stanica nema ništa!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Stanica nema market!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +"CAPI query aborted: Cmdr name unknown" = "CAPI upit prekinut: Ime komandira nepoznato"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +"CAPI query aborted: Game mode unknown" = "CAPI upit prekinut: Režim igre nepoznat"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +"CAPI query aborted: Current system unknown" = "CAPI upit prekinut: Trenutni sistem nepoznat"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +"CAPI query aborted: In other-ship multi-crew" = "CAPI upit prekinut: U multi-posadi drugog broda"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +"CAPI query aborted: CQC (Arena) detected" = "CAPI upit prekinut: CQC (Arena) detektovana"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Nema podataka o komandiru"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Ko ste vi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Gde se nalazite?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "U čemu letite?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Greška na Frontier CAPI serveru"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Poslednji put osveženo %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "cooldown {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Gasim..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Proverite da li postoji nadograđena verzija ili obavesite autora da treba da promeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignoriši"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Podrazumevano"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +232,437 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Obrada žurnala za EDDB je deaktivirana. Pogledajte Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Slanje podataka na EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje na EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspela (EDMC prestar?). Pogledajte log."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Vraćen {STATUS} statusni kod."; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Odloži slanje pre pristajanja"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "Obrada žurnala za EDDN je deaktivirana. Pogledajte Log."; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Pošalji log leta i Cmdr status na EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Kredencijali za Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Ime komandira"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Ključ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ništa"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "EDSM obrada je deaktivirana. Pogledajte Log."; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Greška: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Greška: Nemoguće povezivanje na EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Pošalji log leta i Cmdr status na Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara kredencijali"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara je deaktivirana. Pogledajte Log."; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Greška: SKU problem na Frontier Serveru."; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Greška: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Podešavanja"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Izaberite koji se podaci snimaju"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Fajl sa market podacima u CSV formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Fajl sa market podacima u Trade Dangerous formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Oprema na brodu"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automatsko slanje prilikom pristajanja"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Lokacija fajlova"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Izmeni..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Potraži..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Izlaz"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Lokacija E:D Journal fajlova"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Skraćenica"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Skraćenica"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Restartujte {APP} da bi ste koristili skraćenice"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} traži dozvolu da koristi skraćenice"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Otvori sistemska podešavanja"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Samo kada je Elite: Dangerous aktivna aplikacija"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Zvučni efekat"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Isključi automatsko proveravanje izmena aplikacije za vreme igranja"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Željeni web sajtovi"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Shipyard"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Koristi alternativni URL metod"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Log Nivo"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfiguracija"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Podešavanja privatnosti za osnovni pogled"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Ukloni ime privatne grupe iz osnovnog pogleda"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Ukloni ime kapetana iz višečlane posade"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privatnost"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normalan tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Označeni tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Jezik"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Tamno"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparentno"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Procenat UI skaliranja"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 znači podrazumevano{CR}Restart je potreban{CR}da bi se promene primenile!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Prozirnost glavnog prozora"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 znači potpuno neprozirno.{CR}Prozor se osvežava u realnom vremenu."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Izgled"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Folder za dodatke (plugins)"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Otvori"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: Možete deaktivirati dodatak (plugin) dodavanjem{CR}'{EXT}' na ime njegovog foldera"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Aktivirani dodaci (plugins)"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Pluginovi bez podrške za Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Informacije o migraciji dodataka (plugins)"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Deaktivirani dodaci (plugins)"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Balans"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Pozajmica"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Borba (Combat)"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trgovina (Trade)"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Istraživanje (Explorer)"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federacija"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Imperija"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Minimizuj u sistemsku paletu (SysTray)"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rejting 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rejting 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rejting 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rejting 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rejting 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Status: Još uvek nije poznato ime vašeg komandira"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Status: Još uvek nema CAPI podataka"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Vrednost"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Brodovi"; diff --git a/L10n/sv-SE.strings b/L10n/sv-SE.strings index 21233a84..272c5450 100644 --- a/L10n/sv-SE.strings +++ b/L10n/sv-SE.strings @@ -1,521 +1,512 @@ /* Language name */ "!Language" = "Svenska"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Fel: Frontier server okontaktbar"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Fel: Frontier lag på server"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Fel: ogiltligt användarnamn eller lösenord"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Fel: Fel användare. Har du flera konton eller en gammal API-nyckel från ett nollställt konto?"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Fel: Kan inte ansluta till Inara"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Uppdatera"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Alltid överst"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Roll"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Skepp"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Fil"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Ändra"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "View"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Fönster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Hjälp"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Om {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Sök efter uppdateringar..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Lagra rådata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Integritetspolicy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Versionsinformation"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Inställningar"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Avsluta"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiera"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Loggar in..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Autentisering lyckad"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Du är inte dockad vid en station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "Stationen är tom!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "Stationen har ingen marknad!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Hämtar data..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Vem är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Vart är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "Okänt skepp? (felmeddelande)"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Senaste uppdatering: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "Vänta {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "En eller flera aktiverade plugins har inte stöd för Python 3.x. Var vänlig kontrollera listan med plugins under fliken '{PLUGINS}' under '{FILE}' > '{SETTINGS}'. Kontrollera om det finns en nyare version tillgänglig eller informera utvecklaren.\n\nDu kan också avaktivera din plugin genom att ändra slutet av namnet på mappen till '{DISABLED}'"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins utan stöd för Python 3.x"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Standard"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Skickar data till EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Fel: Kan inte ansluta till EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Skicka stationsdata till Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Skicka system och scan-data till Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Skicka bara uppdateringar till EDDN när du är dockad"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Skicka flight log-data och Cmdr-status till EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map användaruppgifter"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "CMDR namn"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Nyckel"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ingen"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Fel: EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Fel: Kan inte ansluta till EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Skicka flight log-data och Cmdr-status till Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara autentiseringsuppgifter"; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Fel: Frontier server SKU problem (licensnyckel)"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Fel: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Inställningar"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Välj vilket data som skall lagras"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Marknadsdata i CSV-formaterad fil"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Marknadsdata i Trade Dangerous-formaterad fil"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Översikt av skepp"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Automatisk uppdatering vid dockning"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Filsökväg"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Ändra..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Bläddra..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Exportdata"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D journal-fil sökväg"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Genväg, tangentbord"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Snabbkommando"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Starta om {APP} för att använda genvägar"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} behöver rättigheter för att använda genvägar"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Öppna systeminställningar"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Bara när: Elite Dangerous är det aktiva programmet"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Spela ljud"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Leta inte efter programuppdateringar när spelet körs"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Föredragna webbsidor"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Översikt av skepp"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Konfiguration"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Normal text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Markerad text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Språk"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Mörk"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Transparent"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Utseende"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Mapp för plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Öppna"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tips: du kan avaktivera en plugin genom{CR}att lägga till '{EXT}' på slutet av mappens namn"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Aktiverade plugins"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Information om migrering av plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Avaktiverade plugins"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Balance"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Lån"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Federation"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amatör"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Värde"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Skepp"; diff --git a/L10n/uk.strings b/L10n/uk.strings index 3c552667..1b4aa74e 100644 --- a/L10n/uk.strings +++ b/L10n/uk.strings @@ -1,163 +1,157 @@ /* Language name */ "!Language" = "Українська"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "Помилка, Сервер гри не доступний!"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "Помилка: З`єднання з сервером гри з затримками!"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Помилка: Невірні облікові дані!"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "Помилка! Не той обліковий запис!"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "Помилка"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "Помилка: Немає з'єднання з Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "Помилка: Не вдалося перевірити токен customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "Error: customer_id не співпадає!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "Помилка: не вдалося отримати токен"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "Оновлення"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "Поверх інших вікон"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "Невідомо"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Км-др"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "Посада"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "Корабель"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Станція"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "Файл"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "Редагувати"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "Вид"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "Вікно"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "Довідка"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "Про {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "Перевірка оновлень..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "Зберегти необроблені дані..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "Статус"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "Політика конфіденційності"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "Інформація про реліз"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "Налаштування"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "Вихід"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "Документація"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "Копіювати"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "Вхід в..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "Автентифікацію пройдено успішно"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "Ви не стиковані з станцією!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "На станції немає нічого!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "На станції немає ринку!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "Отримання даних..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI: Не отримано данних пілота"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "Хто ти?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "Де ми?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "На чому летимо?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "Останнє оновлення було %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "Винищувач"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "Стрілець"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "Керівник"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "очікування {SS} сек"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "Згода"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "Закриття..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один або кілька увімкнених плагінів ще не підтримують Python 3.x. Перегляньте список на вкладці '{PLUGINS}' в '{FILE}' > '{SETTINGS}'. Ви повинні перевірити, чи є в наявності оновлена ​​версія, інакше повідомити розробника плагіну про те, що їм потрібно оновити код для Python 3.x.\n\nВи можете відключити плагін, перейменувавши його папку додавши '{DISABLED}' в кінці назви."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "Плагіни"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Плагіни без підтримки Python 3.x!"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -172,410 +166,407 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ігнорувати"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Стандартне налаштування"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "Відправка даних до EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "Помилка: Немає зв'язку з EDDN!"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "Надсилати дані станцій до Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "Відправляти систему і результати сканування в Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "Відкласти відправку даних до стикування"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "Відправляти дані бортового журналу до EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Дані Elite Dangerous Star Map"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "Ім`я пілота"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Ключ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Нічого"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "Помилка: EDSM {MSG}!"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Помилка: Немає з`єднання з EDSM!"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "Відправляти дані бортового журналу до Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Обліковий запис Inara"; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "Помилка! Проблема SKU сервера Frontier"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Помилка: Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "Уподобання"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "Оберіть дані які буде збережено"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "Ринкові дані у форматі CSV файлу"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "Ринкові дані у форматі Trade Dangerous файлу"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "Технічні дані корабля"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "Автоматичне оновлювання при стикуванні зі станцією"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "Розташування файлу"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "Внесення змін..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "Перегляд..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "Вивід"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "Розташування файлу-журналу E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "Сполучення клавіш"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "Гаряча клавіша"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "Перезавантажте {APP} для використання ярликів"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} необхідні дозволи для використання ярликів"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "Відкрити налаштування системи"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "Тільки тоді, коли Elite: Dangerous є активним додатком"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "Грати звук"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "Вимкнути автоматичні перевірки оновлення додатку, коли в грі"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "Обрані веб-сайти"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "Корабельна верф"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "Використовувати альтернативний URL-метод"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "Рівень подробиць журналу"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "Конфігурація"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Конфіденційність"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "Нормальний текст"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "Виділений текст"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "Мова"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "Тема"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "Темний"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "Прозора"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ "UI Scale Percentage" = "Відсоток шкали інтерфейсу користувача"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 означає, що {CR} потрібно перезапустити за замовчуванням, щоб зміни вступили в силу {CR}!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "Прозорість головного вікна"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 означає повністю непрозоре. {CR} Вікно буде оновлюватись в режимі реального часу"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "Зовнішній вигляд"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "Сховище плагінів"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "Відкрити"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Підказка: Ви можете відключити плагін через {CR} додання '{EXT}' до назви папки"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "Увімкнені плагіни"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "Плагіни без підтримки Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "Інформація про міграцію плагінів"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "Вимкнені плагіни"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "Баланс"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Борг"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "Бойовий"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "Торговий"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "Дослідницький"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "Близький бій (CQC)"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "Федерація"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "Імперія"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "Змагання"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Безпечний"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Здебільшого Безпечний"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Новачок"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Компетентний"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Експерт"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Майстер"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Небезпечний"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Убивчий"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Еліта"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Злидень"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Здебільшого Нужденний"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Штовхач"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Дилер"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Торговець"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Брокер"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Підприємець"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Магнат"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Безцільний"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "Згорнути програму"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Здебільшого Безцільний"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Розвідник"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Геодезист"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Новатор"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Слідопит"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Рейнджер"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Піонер"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Безпорадний"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Здебільшого Безпомічний"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Аматор"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Напів-професійний"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Професійний"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Чемпіон"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Герой"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Гладіатор"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Рекрут"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Кадет"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Гардемарин"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Унтер Офіцер"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Старший Унтер Офіцер"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Старший сержант"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Прапорщик"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Лейтенант"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Капітан III рангу"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Капітан II рангу"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Капітан I рангу"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Контр-адмірал"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Віце-адмірал"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Адмірал"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Чужинець"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Кріпак"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Зброєносець"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Лицар"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Пан"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Барон"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Віконт"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Граф"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Дворянин"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Маркіз"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Герцог"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Принц"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "Цар"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Рейтинг 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Рейтинг 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Рейтинг 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Рейтинг 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Рейтинг 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Вартість"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "Кораблі"; diff --git a/L10n/zh-Hans.strings b/L10n/zh-Hans.strings index e5ec2436..9d3765b8 100644 --- a/L10n/zh-Hans.strings +++ b/L10n/zh-Hans.strings @@ -1,180 +1,172 @@ -/* Generic 'Check', as in 'Check E:D journal file location' [EDMarketConnector.py] */ -"Check" = "检查"; /* Language name */ "!Language" = "简体中文"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:171; */ +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ "Error: Frontier CAPI didn't respond" = "错误:Frontier CAPI 无响应"; - -/* OLD: Raised when cannot contact the Companion API server. [companion.py] */ -"Error: Frontier server is down" = "错误:Frontier 服务器不可用"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:190; */ +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ "Error: Frontier server is lagging" = "错误:Frontier 服务器繁忙"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:205; */ +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ "Docked but unknown station: EDO Settlement?" = "已靠站但站点未知:可能是 ED: Odyssey 的地面设施?"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:214; */ +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "错误:无效的登录凭证"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:230; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ "Error: Wrong Cmdr" = "错误:指挥官不一致"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:341; companion.py:422; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ "Error" = "错误"; - -/* [inara.py] */ -"Error: Can't connect to Inara" = "错误:无法连接到 Inara"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:380; companion.py:385; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ "Error: Couldn't check token customer_id" = "错误:无法检查 customer_id 令牌"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:391; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ "Error: customer_id doesn't match!" = "错误:customer_id 不匹配!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:413; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ "Error: unable to get token" = "错误:无法获取令牌"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:575; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ "Frontier CAPI query failure" = "无法访问 Frontier CAPI"; -/* companion.py: Frontier CAPI data retrieval failed with 5XX code; In files: companion.py:591; */ -"Frontier CAPI server error" = "Frontier CAPI 服务器错误"; - -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:424; EDMarketConnector.py:718; EDMarketConnector.py:1302; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ "Update" = "更新"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:507; prefs.py:843; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ "Always on top" = "永远在最前"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:636; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ "Unknown" = "未知"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:705; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ "Error: Check E:D journal file location" = "错误:请检查 E:D 日志文件位置"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:712; edsm.py:219; stats.py:50; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "指挥官"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:714; EDMarketConnector.py:1072; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ "Role" = "角色"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:714; EDMarketConnector.py:1082; EDMarketConnector.py:1105; stats.py:363; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ "Ship" = "飞船"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:715; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ "Suit" = "套装"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:716; prefs.py:605; stats.py:365; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:717; prefs.py:623; prefs.py:738; stats.py:366; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "站点"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:720; EDMarketConnector.py:735; EDMarketConnector.py:738; EDMarketConnector.py:1791; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ "File" = "文件"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:721; EDMarketConnector.py:736; EDMarketConnector.py:739; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ "Edit" = "编辑"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:722; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ "View" = "显示"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:723; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ "Window" = "窗口"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:724; EDMarketConnector.py:737; EDMarketConnector.py:740; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ "Help" = "帮助"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:727; EDMarketConnector.py:753; EDMarketConnector.py:1347; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ "About {APP}" = "关于 {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:729; EDMarketConnector.py:752; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ "Check for Updates..." = "检查版本更新…"; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:730; EDMarketConnector.py:744; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ "Save Raw Data..." = "保存原始数据…"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:731; EDMarketConnector.py:743; stats.py:360; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ "Status" = "状态"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:732; EDMarketConnector.py:750; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ "Privacy Policy" = "隐私政策"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:733; EDMarketConnector.py:751; EDMarketConnector.py:1381; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ "Release Notes" = "更新说明"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:745; EDMarketConnector.py:1792; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ "Settings" = "设置"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:746; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ "Exit" = "退出"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:749; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ "Documentation" = "帮助文档"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:756; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ "Copy" = "复制"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:762; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ "Logging in..." = "登录中…"; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:778; EDMarketConnector.py:1215; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ "Authentication successful" = "身份验证成功"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ "You're not docked at a station!" = "你尚未靠站!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ "Station doesn't have anything!" = "此站点没有任何货物!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:822; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ "Station doesn't have a market!" = "此站点没有货物市场!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI to save to file; stats.py: Fetching data from Frontier CAPI in order to display on File > Status; In files: EDMarketConnector.py:867; EDMarketConnector.py:1428; stats.py:279; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ "Fetching data..." = "取得数据…"; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:880; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ "CAPI: No commander data returned" = "CAPI:没有指挥官数据"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:884; stats.py:297; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ "Who are you?!" = "你是谁?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:890; stats.py:307; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ "Where are you?!" = "你在哪里?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:894; stats.py:312; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ "What are you flying?!" = "你在飞什么?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1026; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +"Frontier CAPI server error" = "Frontier CAPI 服务器错误"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ "Last updated at %H:%M:%S" = "最后更新于 %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1052; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ "Fighter" = "舰载机驾驶员"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1053; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ "Gunner" = "炮手"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1054; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ "Helm" = "舵手"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1298; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ "cooldown {SS}s" = "距离下次更新还有 {SS} 秒"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1407; prefs.py:304; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ "OK" = "确定"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1489; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ "Shutting down..." = "应用关闭中…"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1780:1786; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "一项或多项你所启用的插件尚不支持 Python 3.x,详情请见 {FILE} > {SETTINGS} > {PLUGINS}。请检查上述插件是否有可用的更新,若没有,则应与插件的开发者就 Python 3.x 的支持问题取得联系。\n\n你也可以禁用某一项插件,只需在其文件夹名称的末尾添加 {DISABLED} 即可。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1790; prefs.py:953; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ "Plugins" = "插件"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:1801; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC:不支持 Python 3.x 的插件"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -189,7 +181,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "忽略"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:466; prefs.py:678; prefs.py:711; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "默认"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -222,425 +214,431 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB Journal Processing 已禁用。请查看诊断日志。"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:215; eddn.py:619; eddn.py:969; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ "Sending data to EDDN..." = "正在向 EDDN 发送数据…"; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:264; eddn.py:907; eddn.py:942; eddn.py:981; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ "Error: Can't connect to EDDN" = "错误:无法连接到 EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:282; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 错误:EDDN 禁止了此旧版本的 EDMC 应用。请更新应用。"; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:288; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 错误:数据有效性检查失败。可能是 EDMC 应用版本过旧,请查看诊断日志。"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:293; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ "EDDN Error: Returned {STATUS} status code" = "EDDN 错误:返回错误代码 {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:699; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ "Send station data to the Elite Dangerous Data Network" = "发送站点数据到 Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:710; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ "Send system and scan data to the Elite Dangerous Data Network" = "发送星系和扫描数据到 Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:721; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ "Delay sending until docked" = "延时更新,靠站时再发送"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:785; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ "EDDN journal handler disabled. See Log." = "EDDN Journal Handler 已禁用。请查看诊断日志。"; -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:198; */ +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ "Send flight log and Cmdr status to EDSM" = "发送航行日志和指挥官状态到 EDSM"; -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:208; */ +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map 授权凭证"; -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:227; */ +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ "Commander Name" = "指挥官名称"; -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:235; inara.py:237; */ +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:262; prefs.py:518; prefs.py:1156; prefs.py:1189; stats.py:117; stats.py:136; stats.py:155; stats.py:172; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "无"; -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:358; */ +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ "EDSM Handler disabled. See Log." = "EDSM Handler 已禁用。请查看诊断日志。"; -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:640; edsm.py:745; */ +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ "Error: EDSM {MSG}" = "错误:EDSM {MSG}"; -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:677; edsm.py:740; */ +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "错误:无法连接到 EDSM"; -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:216; */ +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ "Send flight log and Cmdr status to Inara" = "发送航行日志和指挥官状态到 Inara"; -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:228; */ +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ "Inara credentials" = "Inara 授权凭证"; -/* inara.py: INARA support disabled via killswitch; In files: inara.py:335; */ +/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ "Inara disabled. See Log." = "Inara 已禁用。请查看诊断日志。"; - -/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */ -"Error: Frontier server SKU problem" = "错误:Frontier 服务器检测到 SKU 不匹配"; -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1549; inara.py:1562; */ +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "错误:Inara {MSG}"; /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ "Preferences" = "偏好"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:346; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ "Please choose what data to save" = "请选择想要保存的数据"; -/* prefs.py: Settings > Output option; In files: prefs.py:352; */ +/* prefs.py: Settings > Output option; In files: prefs.py:353; */ "Market data in CSV format file" = "货物市场数据,以 CSV 文件格式"; -/* prefs.py: Settings > Output option; In files: prefs.py:361; */ +/* prefs.py: Settings > Output option; In files: prefs.py:362; */ "Market data in Trade Dangerous format file" = "货物市场数据,以 Trade Dangerous 文件格式"; -/* prefs.py: Settings > Output option; In files: prefs.py:371; */ +/* prefs.py: Settings > Output option; In files: prefs.py:372; */ "Ship loadout" = "飞船配置"; -/* prefs.py: Settings > Output option; In files: prefs.py:381; */ +/* prefs.py: Settings > Output option; In files: prefs.py:382; */ "Automatically update on docking" = "靠站时自动更新"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:390; prefs.py:409; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ "File location" = "保存位置"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:398; prefs.py:448; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ "Change..." = "更改…"; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:401; prefs.py:451; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ "Browse..." = "浏览…"; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:416; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ "Output" = "导出"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:442; prefs.py:457; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ "E:D journal file location" = "E:D 日志文件位置"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:482; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ "Keyboard shortcut" = "键盘快捷键"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:484; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ "Hotkey" = "快捷键"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:493; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ "Re-start {APP} to use shortcuts" = "重启 {APP} 以使用快捷键"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:502; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ "{APP} needs permission to use shortcuts" = "{APP} 需要权限以使用快捷键"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:507; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ "Open System Preferences" = "打开系统偏好设置"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:529; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ "Only when Elite: Dangerous is the active app" = "仅当 Elite: Dangerous 在前台运行时生效"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:540; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ "Play sound" = "发出提示音"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:555; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ "Disable Automatic Application Updates Check when in-game" = "当我在玩游戏时,禁止此应用自动检查版本更新。"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:568; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ "Preferred websites" = "首选网站"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:579; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ "Shipyard" = "配船"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:591; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ "Use alternate URL method" = "若链接过长无法打开,请勾选此项"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:644; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ "Log Level" = "诊断模式"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:672; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ "Configuration" = "通用"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:685; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "用户界面隐私选项"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "在用户界面中隐藏私人组 (private group) 名称"; + +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "在用户界面中隐藏多人共乘 (multi-crew) 时的舰长名称"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "隐私"; + +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ "Normal text" = "普通文本"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:687; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ "Highlighted text" = "重点文本"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:696; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ "Language" = "语言"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:706; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ "Theme" = "主题"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:717; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ "Dark" = "深色"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:724; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ "Transparent" = "透明"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:770; */ -"UI Scale Percentage" = "UI 缩放比例"; +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +"UI Scale Percentage" = "用户界面缩放比例"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:791; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 为默认设置{CR}需要重启应用{CR}以使修改生效"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:801; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ "Main window transparency" = "主窗口透明度"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:821:824; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 为完全不透明{CR}效果实时更新"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:860; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ "Appearance" = "外观"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:875; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ "Plugins folder" = "插件文件夹"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:882; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ "Open" = "打开"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:890; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "提示:想要禁用某一项插件,{CR}你可以添加 {EXT} 到其文件夹名称中"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:901; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ "Enabled Plugins" = "已启用插件"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:921; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ "Plugins Without Python 3.x Support:" = "不支持 Python 3.x 的插件:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:929; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ "Information on migrating plugins" = "关于插件迁移"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:944; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ "Disabled Plugins" = "已禁用插件"; -/* stats.py: Cmdr stats; In files: stats.py:51; */ +/* stats.py: Cmdr stats; In files: stats.py:53; */ "Balance" = "资金结余"; -/* stats.py: Cmdr stats; In files: stats.py:52; */ +/* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "贷款"; -/* stats.py: Ranking; In files: stats.py:57; */ +/* stats.py: Ranking; In files: stats.py:59; */ "Combat" = "战斗等级"; -/* stats.py: Ranking; In files: stats.py:58; */ +/* stats.py: Ranking; In files: stats.py:60; */ "Trade" = "贸易等级"; -/* stats.py: Ranking; In files: stats.py:59; */ +/* stats.py: Ranking; In files: stats.py:61; */ "Explorer" = "探索等级"; -/* stats.py: Ranking; In files: stats.py:60; */ +/* stats.py: Ranking; In files: stats.py:62; */ "CQC" = "竞技场等级"; -/* stats.py: Ranking; In files: stats.py:61; */ +/* stats.py: Ranking; In files: stats.py:63; */ "Federation" = "联邦军衔"; -/* stats.py: Ranking; In files: stats.py:62; */ +/* stats.py: Ranking; In files: stats.py:64; */ "Empire" = "帝国头衔"; -/* stats.py: Ranking; In files: stats.py:63; */ +/* stats.py: Ranking; In files: stats.py:65; */ "Powerplay" = "势力"; -/* stats.py: Combat rank; In files: stats.py:71; */ +/* stats.py: Combat rank; In files: stats.py:73; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:72; */ +/* stats.py: Combat rank; In files: stats.py:74; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:76; stats.py:139; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:78; */ +/* stats.py: Combat rank; In files: stats.py:80; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:79; stats.py:90; stats.py:101; stats.py:112; */ +/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:82; */ +/* stats.py: Trade rank; In files: stats.py:84; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:83; */ +/* stats.py: Trade rank; In files: stats.py:85; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:93; */ +/* stats.py: Explorer rank; In files: stats.py:95; */ "Aimless" = "Aimless"; - -/* Appearance setting. [EDMarketConnector.py] */ -"Minimize to system tray" = "最小化到系统托盘"; -/* stats.py: Explorer rank; In files: stats.py:94; */ +/* stats.py: Explorer rank; In files: stats.py:96; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:104; */ +/* stats.py: CQC rank; In files: stats.py:106; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:105; */ +/* stats.py: CQC rank; In files: stats.py:107; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:108; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:109; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:110; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:111; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:112; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:113; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:118; */ +/* stats.py: Federation rank; In files: stats.py:120; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:119; */ +/* stats.py: Federation rank; In files: stats.py:121; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:122; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:123; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:124; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:125; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:126; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:127; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:128; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:129; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:130; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:131; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:132; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:133; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:137; */ +/* stats.py: Empire rank; In files: stats.py:139; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:138; */ +/* stats.py: Empire rank; In files: stats.py:140; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:142; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:141; */ +/* stats.py: Empire rank; In files: stats.py:143; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:144; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:145; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:146; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:147; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:148; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:149; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:150; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:151; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:152; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:156; */ +/* stats.py: Power rank; In files: stats.py:158; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:157; */ +/* stats.py: Power rank; In files: stats.py:159; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:160; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:161; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:367; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "价值"; -/* stats.py: Status dialog title; In files: stats.py:376; */ +/* stats.py: Status dialog title; In files: stats.py:380; */ "Ships" = "所有飞船"; From 6f31e18947e0ea1bb3b91b02409f31d75d1ff00a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 25 Oct 2021 11:02:54 +0100 Subject: [PATCH 178/527] Release 5.2.0: appversion & changelog --- ChangeLog.md | 45 +++++++++++++++++++-------------------------- config.py | 2 +- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index ab487120..b4f5a1f8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,30 +27,10 @@ produce the Windows executables and installer. --- -Pre-Release 5.2.0 beta2 +Release 5.2.0 === -* Trying to use `File` > `Status` when the current commander is unknown, or - there is has been no CAPI data retrieval yet, will now result in the 'bad' - sound being played and an appropriate status line message. - -* Pressing the 'Update' button when in space (not docked, not on a body - surface) will no longer cause a spurious "Docked but unknown station: EDO - Settlement?" message. - -Pre-Release 5.2.0 beta2 -=== - -* Don't save, for later retry, any EDDN messages that are met with 'unknown - schema' from the server. This should alleviate any "laggy UI" problems that - their accumulation can cause. - -Pre-Release 5.2.0 beta1 -=== - -* Now built using Python 3.9.7. - -* `Update` button is disabled if CQC/Arena is detected. +* The 'Update' button is disabled if CQC/Arena is detected. * Frontier CAPI queries now run in their own thread. There should be no change in functionality for users. This affects both EDMarketConnector @@ -60,6 +40,10 @@ Pre-Release 5.2.0 beta1 query. **Currently if data has not yet been cached nothing will happen when trying to use this**. +* Trying to use `File` > `Status` when the current commander is unknown, or + there is has been no CAPI data retrieval yet, will now result in the 'bad' + sound being played and an appropriate status line message. + * `File` > `Save Raw Data` also now uses the cached CAPI data, rather than causing a fresh query. This will write an empty JSON `{}` if no data is yet available. @@ -77,8 +61,7 @@ Pre-Release 5.2.0 beta1 logical groups for `--help` output. * Support added for several new EDDN schemas relating to specific Journal - events. Until the live EDDN server is updated (planned for 2021-10-21) you - will see minor error logging when this fails due to 'unknown schema'. + events. The live EDDN server has been updated to support these. Schema support added for: - `codexentry/1` @@ -87,9 +70,16 @@ Pre-Release 5.2.0 beta1 - `navroute/1` - `scanbarycentre/1` +* If a message to EDDN gets an 'unknown schema' response it will **NOT** be + saved in the replaylog for later retries, instead being discarded. + Bug Fixes --- +* Pressing the 'Update' button when in space (not docked, not on a body + surface) will no longer cause a spurious "Docked but unknown station: EDO + Settlement?" message. + * A bug preventing `--force-localserver-auth` from working has been fixed. * `horizons` and `odyssey` flags should now always be set properly on *all* @@ -98,6 +88,8 @@ Bug Fixes Developers --- +* Now built using Python 3.9.7. + * New `journal_entry_cqc()` function for plugins to receive journal events *specifically and **only** when the player is in CQC/Arena*. This allows for tracking things that happen in CQC/Arena without polluting @@ -122,8 +114,9 @@ Developers command-line argument. This needs to be the *full* 'upload' URL, i.e. for the live instance this is `https://eddn.edcd.io:4430/upload/`. -* New command-line argument `--eddn-tracking-ui` to track the EDDN handling - code's idea of the current Journal and Status.json Body(Name|ID). +* New command-line argument `--eddn-tracking-ui` to track the EDDN plugin's + idea of the current BodyName and BodyID, from both the Journal and + Status.json. --- diff --git a/config.py b/config.py index 93078020..d690da56 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.0-beta3' +_static_appversion = '5.2.0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 927b226f853af8769aecd6b56c8db44adb804774 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 17:03:41 +0000 Subject: [PATCH 179/527] build(deps-dev): bump autopep8 from 1.5.7 to 1.6.0 Bumps [autopep8](https://github.com/hhatto/autopep8) from 1.5.7 to 1.6.0. - [Release notes](https://github.com/hhatto/autopep8/releases) - [Commits](https://github.com/hhatto/autopep8/compare/v1.5.7...v1.6.0) --- updated-dependencies: - dependency-name: autopep8 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 16d01f5a..dc6df745 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -21,7 +21,7 @@ safety==1.10.3 types-requests==2.25.11 # Code formatting tools -autopep8==1.5.7 +autopep8==1.6.0 # HTML changelogs grip==4.5.2 From 034a662c48efbe6c8343a5ad8f5895b24cadce63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Nov 2021 17:04:09 +0000 Subject: [PATCH 180/527] build(deps-dev): bump coverage[toml] from 6.0.2 to 6.1.1 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.0.2 to 6.1.1. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.0.2...6.1.1) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 16d01f5a..1198a685 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ py2exe==0.10.4.1; sys_platform == 'win32' # Testing pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.0.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.1.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==302; sys_platform == 'win32' From 48c10978c6c78cac0f64c6865cae7fabb9e7996d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 17:03:39 +0000 Subject: [PATCH 181/527] build(deps): bump actions/checkout from 2.3.5 to 2.4.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 03dc1744..5361f84e 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -28,7 +28,7 @@ jobs: # based on. - name: Checkout head commits # https://github.com/actions/checkout - uses: actions/checkout@v2.3.5 + uses: actions/checkout@v2.4.0 #with: #ref: ${{github.head.sha}} #repository: ${{github.event.pull_request.head.repo.full_name}} diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 8c7f54b3..021b9109 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2.3.5 + - uses: actions/checkout@v2.4.0 with: fetch-depth: 0 - name: Set up Python 3.9 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 06c1c027..05e01364 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -16,7 +16,7 @@ jobs: shell: powershell steps: - - uses: actions/checkout@v2.3.5 + - uses: actions/checkout@v2.4.0 - uses: actions/setup-python@v2.2.2 with: python-version: "3.9.7" From 87cecf4f96070ab359b4a059219a9b9782e30f57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 17:03:50 +0000 Subject: [PATCH 182/527] build(deps-dev): bump isort from 5.9.3 to 5.10.0 Bumps [isort](https://github.com/pycqa/isort) from 5.9.3 to 5.10.0. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.9.3...5.10.0) --- updated-dependencies: - dependency-name: isort dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 71401129..4d2c0a0c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,7 +8,7 @@ flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 flake8-docstrings==1.6.0 -isort==5.9.3 +isort==5.10.0 flake8-isort==4.1.1 flake8-json==21.7.0 flake8-noqa==1.2.0 From 8e32ecd216997251f7e22c57000f4a4eb7aa3b62 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 5 Nov 2021 17:52:50 +0000 Subject: [PATCH 183/527] CAPI: Actually try to use Refresh Token if CAPI says unauthorized The refactor for threaded CAPI worker has inadvertently caused us to always try *full* re-auth when the CAPI signals the Access Token is expired. --- EDMarketConnector.py | 7 +++++++ companion.py | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 35d2c58a..e561eb24 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1159,6 +1159,13 @@ class AppWindow(object): # LANG: Frontier CAPI server error when fetching data self.status['text'] = _('Frontier CAPI server error') + except companion.CredentialsRequireRefresh: + # LANG: Frontier CAPI Access Token expired, trying to get a new one + self.status['text'] = _('CAPI: Refreshing access token...') + if companion.session.login(): + logger.debug('Initial query failed, but login() just worked, trying again...') + companion.session.retrying = True + except companion.CredentialsError: companion.session.retrying = False companion.session.invalidate() diff --git a/companion.py b/companion.py index 1a811858..7c9cc96a 100644 --- a/companion.py +++ b/companion.py @@ -265,6 +265,15 @@ class CredentialsError(Exception): self.args = (_('Error: Invalid Credentials'),) +class CredentialsRequireRefresh(Exception): + """Exception Class for CAPI credentials requiring refresh.""" + + def __init__(self, *args) -> None: + self.args = args + if not args: + self.args = ('CAPI: Requires refresh of Access Token',) + + class CmdrError(Exception): """Exception Class for CAPI Commander error. @@ -772,6 +781,7 @@ class Session(object): self.dump(r) if r.status_code == 401: # CAPI doesn't think we're Auth'd + # TODO: This needs to try a REFRESH, not a full re-auth # No need for translation, we'll go straight into trying new Auth # and thus any message would be overwritten. raise CredentialsError('Frontier CAPI said Auth required') from e From 7a52ddd27801fc979d31408e496e3e206adbf93d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 5 Nov 2021 17:57:35 +0000 Subject: [PATCH 184/527] CAPI: Add retry of request after refreshing Access Token --- EDMarketConnector.py | 2 ++ companion.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index e561eb24..32e4072a 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1165,6 +1165,8 @@ class AppWindow(object): if companion.session.login(): logger.debug('Initial query failed, but login() just worked, trying again...') companion.session.retrying = True + self.w.after(int(SERVER_RETRY * 1000), lambda: self.capi_request_data(event)) + return # early exit to avoid starting cooldown count except companion.CredentialsError: companion.session.retrying = False diff --git a/companion.py b/companion.py index 7c9cc96a..18b53402 100644 --- a/companion.py +++ b/companion.py @@ -784,7 +784,7 @@ class Session(object): # TODO: This needs to try a REFRESH, not a full re-auth # No need for translation, we'll go straight into trying new Auth # and thus any message would be overwritten. - raise CredentialsError('Frontier CAPI said Auth required') from e + raise CredentialsRequireRefresh('Frontier CAPI said "unauthorized"') from e if r.status_code == 418: # "I'm a teapot" - used to signal maintenance # LANG: Frontier CAPI returned 418, meaning down for maintenance From 919136874d3c32b354a3ea9d3fa2872cb233b754 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 6 Nov 2021 08:41:09 +0000 Subject: [PATCH 185/527] CAPI: Re-auth when Access Token expired: Need to .close() first The old code did this, and without it we enter a loop of: 1. CAPI says unauthorized 2. We call login() 3. But companion.session.state == STATE_OK, so do nothing 4. Re-scheduled CAPI request goes back to 1. --- EDMarketConnector.py | 2 ++ monitor.py | 1 + 2 files changed, 3 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 32e4072a..3b969d8b 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1160,6 +1160,8 @@ class AppWindow(object): self.status['text'] = _('Frontier CAPI server error') except companion.CredentialsRequireRefresh: + # We need to 'close' the auth else it'll see STATE_OK and think login() isn't needed + companion.session.close() # LANG: Frontier CAPI Access Token expired, trying to get a new one self.status['text'] = _('CAPI: Refreshing access token...') if companion.session.login(): diff --git a/monitor.py b/monitor.py index debba020..65119f7f 100644 --- a/monitor.py +++ b/monitor.py @@ -1210,6 +1210,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below } except KeyError: + # TODO: Log the exception details too, for some clue about *which* key logger.error(f"LoadoutEquipModule: {entry}") elif event_type == 'loadoutremovemodule': From 6bec46be4e644cafbff1e5a337160ca4d8773fc6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 6 Nov 2021 10:41:33 +0000 Subject: [PATCH 186/527] CAPI: Implement a one-shot override of the Access Token This allows you to force use of an expired token so as to test the code paths for that without waiting up to 4 hours for the current one to expire. NB: The Access Token is *only* stored in the headers of the `requests` object. --- EDMarketConnector.py | 11 +++++++++++ companion.py | 6 ++++++ config.py | 1 + 3 files changed, 18 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 3b969d8b..24453a47 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -151,6 +151,12 @@ if __name__ == '__main__': # noqa: C901 action='store_true' ) + parser.add_argument( + '--capi-use-debug-access-token', + help='Load a debug Access Token from disk (from config.app_dir_pathapp_dir_path / access_token.txt)', + action='store_true' + ) + parser.add_argument( '--eddn-url', help='Specify an alternate EDDN upload URL', @@ -170,6 +176,11 @@ if __name__ == '__main__': # noqa: C901 logger.info('Pretending CAPI is down') conf_module.capi_pretend_down = True + if args.capi_use_debug_access_token: + import config as conf_module + with open(conf_module.config.app_dir_path / 'access_token.txt', 'r') as at: + conf_module.capi_debug_access_token = at.readline().strip() + level_to_set: Optional[int] = None if args.trace or args.trace_on: level_to_set = logging.TRACE # type: ignore # it exists diff --git a/companion.py b/companion.py index 18b53402..2682fd8a 100644 --- a/companion.py +++ b/companion.py @@ -759,7 +759,13 @@ class Session(object): if conf_module.capi_pretend_down: raise ServerConnectionError(f'Pretending CAPI down: {capi_endpoint}') + if conf_module.capi_debug_access_token is not None: + self.requests_session.headers['Authorization'] = f'Bearer {conf_module.capi_debug_access_token}' # type: ignore # noqa: E501 + # This is one-shot + conf_module.capi_debug_access_token = None + r = self.requests_session.get(self.server + capi_endpoint, timeout=timeout) # type: ignore + logger.trace_if('capi.worker', '... got result...') r.raise_for_status() # Typically 403 "Forbidden" on token expiry # May also fail here if token expired since response is empty diff --git a/config.py b/config.py index d690da56..8660397f 100644 --- a/config.py +++ b/config.py @@ -46,6 +46,7 @@ debug_senders: List[str] = [] trace_on: List[str] = [] capi_pretend_down: bool = False +capi_debug_access_token: Optional[str] # This must be done here in order to avoid an import cycle with EDMCLogging. # Other code should use EDMCLogging.get_main_logger if os.getenv("EDMC_NO_UI"): From b8719edb9277af43f100085d23fbfe73f4bff5f5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 6 Nov 2021 14:19:33 +0000 Subject: [PATCH 187/527] Pre-Release 5.2.1-rc1: appversion and changelog --- ChangeLog.md | 10 ++++++++++ config.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index b4f5a1f8..7b10f97f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,16 @@ produce the Windows executables and installer. --- +Pre-Release 5.2.1-rc1 +=== + +This release primarily addresses the issue of the program asking for +Frontier authorization much too often. + +* Actually utilise the Frontier Refresh Token when the CAPI response is + "Unauthorized". The re-factoring of this code to make CAPI queries + threaded inadvertently prevented this. + Release 5.2.0 === diff --git a/config.py b/config.py index 8660397f..611e15f5 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.0' +_static_appversion = '5.2.1-rc1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 7bf564d3b322eaa9dbe0f0fe3946506f7702f54b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 6 Nov 2021 14:56:57 +0000 Subject: [PATCH 188/527] CAPI: ensure config.capi_debug_access_token is bound/set --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 8660397f..702873ee 100644 --- a/config.py +++ b/config.py @@ -46,7 +46,7 @@ debug_senders: List[str] = [] trace_on: List[str] = [] capi_pretend_down: bool = False -capi_debug_access_token: Optional[str] +capi_debug_access_token: Optional[str] = None # This must be done here in order to avoid an import cycle with EDMCLogging. # Other code should use EDMCLogging.get_main_logger if os.getenv("EDMC_NO_UI"): From 39a303fd179d54f8cbff45800892d9b482b16d8c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 6 Nov 2021 14:58:30 +0000 Subject: [PATCH 189/527] Pre-Release 5.2.1-rc2: appversion and changelog --- ChangeLog.md | 6 ++++++ config.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7b10f97f..8eb87880 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,12 @@ produce the Windows executables and installer. --- +Pre-Release 5.2.1-rc2 +=== + +This fixes a code error that prevented caused some new debug code to cause +CAPI queries to fail. + Pre-Release 5.2.1-rc1 === diff --git a/config.py b/config.py index 4d74ca23..b530324f 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.1-rc1' +_static_appversion = '5.2.1-rc2' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From b589ac39a5624e8a017496a729a95e940c0f36e3 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 7 Nov 2021 11:59:26 +0000 Subject: [PATCH 190/527] Release 5.2.1: appversion and changelog --- ChangeLog.md | 8 +------- config.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 8eb87880..7c2b8ad3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,13 +27,7 @@ produce the Windows executables and installer. --- -Pre-Release 5.2.1-rc2 -=== - -This fixes a code error that prevented caused some new debug code to cause -CAPI queries to fail. - -Pre-Release 5.2.1-rc1 +Release 5.2.1 === This release primarily addresses the issue of the program asking for diff --git a/config.py b/config.py index b530324f..d50d5495 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.1-rc2' +_static_appversion = '5.2.1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 9eb90efed68a3f22bb6cb702481ffaf035abccc0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 7 Nov 2021 12:25:23 +0000 Subject: [PATCH 191/527] Bump pyton version to 3.9.8 --- .github/workflows/windows-build.yml | 2 +- .python-version | 2 +- ChangeLog.md | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 05e01364..80965e54 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.4.0 - uses: actions/setup-python@v2.2.2 with: - python-version: "3.9.7" + python-version: "3.9.8" architecture: "x86" - name: Install python tools diff --git a/.python-version b/.python-version index f69abe41..26cb4859 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.7 +3.9.8 diff --git a/ChangeLog.md b/ChangeLog.md index 7c2b8ad3..38eebba3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.9.7. +* We now test against, and package with, Python 3.9.8. **As a consequence of this we no longer support Windows 7. This is due to @@ -27,6 +27,12 @@ produce the Windows executables and installer. --- +Developers +--- + +* Now built using Python 3.9.8. + + Release 5.2.1 === From 6c383b050c67cfd9f426cf1e8a69d947c416fd24 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 7 Nov 2021 13:19:47 +0000 Subject: [PATCH 192/527] config: develop appversion bump to 5.3.0-beta0 --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index d50d5495..053eb0d7 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.1' +_static_appversion = '5.3.0-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 93d69a9809082e0e0d3b199e14c3c2eedd446ea7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 17:05:21 +0000 Subject: [PATCH 193/527] build(deps-dev): bump isort from 5.10.0 to 5.10.1 Bumps [isort](https://github.com/pycqa/isort) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.10.0...5.10.1) --- updated-dependencies: - dependency-name: isort dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 4d2c0a0c..49c0ed37 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,7 +8,7 @@ flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.7.0 flake8-docstrings==1.6.0 -isort==5.10.0 +isort==5.10.1 flake8-isort==4.1.1 flake8-json==21.7.0 flake8-noqa==1.2.0 From a8a1cf3249a9f44fcf7fd7cb6015219393b15fea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 17:05:24 +0000 Subject: [PATCH 194/527] build(deps-dev): bump types-requests from 2.25.11 to 2.25.12 Bumps [types-requests](https://github.com/python/typeshed) from 2.25.11 to 2.25.12. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 4d2c0a0c..1d5a2c3a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.910 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.25.11 +types-requests==2.25.12 # Code formatting tools autopep8==1.6.0 From b0b1ed589bc167800345b7d1c7658e3c9cde30bd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 10 Nov 2021 10:07:37 +0000 Subject: [PATCH 195/527] CAPI: Don't blindly dump r(equest.Response) on failure Also explicitly logs the exception now. --- companion.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/companion.py b/companion.py index 2682fd8a..a518fac1 100644 --- a/companion.py +++ b/companion.py @@ -343,6 +343,7 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: + r: Optional[requests.Response] = None r = self.requests_session.post( FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, data=data, @@ -360,9 +361,10 @@ class Auth(object): logger.error(f"Frontier CAPI Auth: Can't refresh token for \"{self.cmdr}\"") self.dump(r) - except (ValueError, requests.RequestException, ): - logger.exception(f"Frontier CAPI Auth: Can't refresh token for \"{self.cmdr}\"") - self.dump(r) + except (ValueError, requests.RequestException, ) as e: + logger.exception(f"Frontier CAPI Auth: Can't refresh token for \"{self.cmdr}\"\n{e!r}") + if r is not None: + self.dump(r) else: logger.error(f"Frontier CAPI Auth: No token for \"{self.cmdr}\"") From f427ca0d3867a88e165fb0d0a2d5861fc8833da4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 17:04:26 +0000 Subject: [PATCH 196/527] build(deps-dev): bump types-requests from 2.25.12 to 2.26.0 Bumps [types-requests](https://github.com/python/typeshed) from 2.25.12 to 2.26.0. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 94be18f8..ae9e658e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.910 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.25.12 +types-requests==2.26.0 # Code formatting tools autopep8==1.6.0 From 5c3c7dff0013e2ca312dc1a8a98cd4db4cd6d0aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 17:03:26 +0000 Subject: [PATCH 197/527] build(deps-dev): bump coverage[toml] from 6.1.1 to 6.1.2 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.1.1 to 6.1.2. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.1.1...6.1.2) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index ae9e658e..2f687257 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ py2exe==0.10.4.1; sys_platform == 'win32' # Testing pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.1.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.1.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==302; sys_platform == 'win32' From 4d069cb40691cdeafe7a50945d76f4146c3bdc83 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 12 Nov 2021 13:17:27 +0000 Subject: [PATCH 198/527] Attempting to re-enable Windows "minimize to system tray" support 1. It's not actually hiding the task bar icon currently. 2. As this touched prefs.py I've done a flake8 and mypy cleanup pass too. But some of that will want reviewing later as I noqa'd some things. --- EDMarketConnector.py | 38 ++++++++++++++++----------------- prefs.py | 51 ++++++++++++++++++++++---------------------- requirements.txt | 2 +- setup.py | 1 - 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 24453a47..06fb5bc6 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -9,7 +9,7 @@ import pathlib import queue import re import sys -# import threading +import threading import webbrowser from builtins import object, str from os import chdir, environ @@ -371,7 +371,7 @@ if __name__ == '__main__': # noqa: C901 if TYPE_CHECKING: from logging import TRACE # type: ignore # noqa: F401 # Needed to update mypy import update - # from infi.systray import SysTrayIcon + from infi.systray import SysTrayIcon # isort: on def _(x: str) -> str: @@ -442,16 +442,16 @@ class AppWindow(object): self.prefsdialog = None - # if platform == 'win32': - # from infi.systray import SysTrayIcon + if platform == 'win32': + from infi.systray import SysTrayIcon - # def open_window(systray: 'SysTrayIcon') -> None: - # self.w.deiconify() + def open_window(systray: 'SysTrayIcon') -> None: + self.w.deiconify() - # menu_options = (("Open", None, open_window),) - # # Method associated with on_quit is called whenever the systray is closing - # self.systray = SysTrayIcon("EDMarketConnector.ico", applongname, menu_options, on_quit=self.exit_tray) - # self.systray.start() + menu_options = (("Open", None, open_window),) + # Method associated with on_quit is called whenever the systray is closing + self.systray = SysTrayIcon("EDMarketConnector.ico", applongname, menu_options, on_quit=self.exit_tray) + self.systray.start() plug.load_plugins(master) @@ -1663,18 +1663,18 @@ class AppWindow(object): with open(f, 'wb') as h: h.write(str(companion.session.capi_raw_data).encode(encoding='utf-8')) - # def exit_tray(self, systray: 'SysTrayIcon') -> None: - # """Tray icon is shutting down.""" - # exit_thread = threading.Thread(target=self.onexit) - # exit_thread.setDaemon(True) - # exit_thread.start() + def exit_tray(self, systray: 'SysTrayIcon') -> None: + """Tray icon is shutting down.""" + exit_thread = threading.Thread(target=self.onexit) + exit_thread.setDaemon(True) + exit_thread.start() def onexit(self, event=None) -> None: """Application shutdown procedure.""" - # if platform == 'win32': - # shutdown_thread = threading.Thread(target=self.systray.shutdown) - # shutdown_thread.setDaemon(True) - # shutdown_thread.start() + if platform == 'win32': + shutdown_thread = threading.Thread(target=self.systray.shutdown) + shutdown_thread.setDaemon(True) + shutdown_thread.start() config.set_shutdown() # Signal we're in shutdown now. diff --git a/prefs.py b/prefs.py index c403023b..6e06f610 100644 --- a/prefs.py +++ b/prefs.py @@ -5,7 +5,7 @@ import contextlib import logging import tkinter as tk import webbrowser -from os.path import exists, expanduser, expandvars, join, normpath +from os.path import expanduser, expandvars, join, normpath from sys import platform from tkinter import colorchooser as tkColorChooser # type: ignore # noqa: N812 from tkinter import ttk @@ -60,17 +60,17 @@ class PrefsVersion: def __init__(self): return - def stringToSerial(self, versionStr: str) -> int: # noqa: N802 # used in plugins + def stringToSerial(self, version_str: str) -> int: # noqa: N802 # used in plugins """ Convert a version string into a preferences version serial number. If the version string isn't known returns the 'current' (latest) serial number. - :param versionStr: + :param version_str: :return int: """ - if versionStr in self.versions: - return self.versions[versionStr] + if version_str in self.versions: + return self.versions[version_str] return self.versions['current'] @@ -83,7 +83,6 @@ class PrefsVersion: :raises ValueError: on serial number after the current latest :return: bool indicating the answer """ - # config.get('PrefsVersion') is the version preferences we last saved for pv = config.get_int('PrefsVersion') # If no PrefsVersion yet exists then return oldTest @@ -202,6 +201,8 @@ elif platform == 'win32': BrowseCallbackProc = ctypes.WINFUNCTYPE(ctypes.c_int, HWND, ctypes.c_uint, LPARAM, LPARAM) class BROWSEINFO(ctypes.Structure): + """Windows file browser fields.""" + _fields_ = [("hwndOwner", HWND), ("pidlRoot", LPVOID), ("pszDisplayName", LPWSTR), ("lpszTitle", LPCWSTR), ("ulFlags", UINT), ("lpfn", BrowseCallbackProc), ("lParam", LPCWSTR), ("iImage", ctypes.c_int)] @@ -326,7 +327,7 @@ class PreferencesDialog(tk.Toplevel): GetWindowRect(GetParent(self.winfo_id()), position) if CalculatePopupWindowPosition( POINT(parent.winfo_rootx(), parent.winfo_rooty()), - SIZE(position.right - position.left, position.bottom - position.top), + SIZE(position.right - position.left, position.bottom - position.top), # type: ignore 0x10000, None, position ): self.geometry(f"+{position.left}+{position.top}") @@ -422,7 +423,7 @@ class PreferencesDialog(tk.Toplevel): if plugin_frame: notebook.add(plugin_frame, text=plugin.name) - def __setup_config_tab(self, notebook: Notebook) -> None: + def __setup_config_tab(self, notebook: Notebook) -> None: # noqa: CCR001 config_frame = nb.Frame(notebook) config_frame.columnconfigure(1, weight=1) row = AutoInc(start=1) @@ -700,7 +701,7 @@ class PreferencesDialog(tk.Toplevel): # LANG: The system default language choice in Settings > Appearance self.lang = tk.StringVar(value=self.languages.get(config.get_str('language'), _('Default'))) self.always_ontop = tk.BooleanVar(value=bool(config.get_int('always_ontop'))) - # self.minimize_system_tray = tk.BooleanVar(value=config.get_bool('minimize_system_tray')) + self.minimize_system_tray = tk.BooleanVar(value=config.get_bool('minimize_system_tray')) self.theme = tk.IntVar(value=config.get_int('theme')) self.theme_colors = [config.get_str('dark_text'), config.get_str('dark_highlight')] self.theme_prompts = [ @@ -798,7 +799,7 @@ class PreferencesDialog(tk.Toplevel): self.ui_scale.set(config.get_int('ui_scale')) self.uiscale_bar = tk.Scale( appearance_frame, - variable=self.ui_scale, # TODO: intvar, but annotated as DoubleVar + variable=self.ui_scale, # type: ignore # TODO: intvar, but annotated as DoubleVar orient=tk.HORIZONTAL, length=300 * (float(theme.startup_ui_scale) / 100.0 * theme.default_ui_scale), # type: ignore # runtime from_=0, @@ -869,20 +870,20 @@ class PreferencesDialog(tk.Toplevel): ) self.ontop_button.grid(columnspan=3, padx=self.BUTTONX, sticky=tk.W, row=row.get()) # Appearance setting - # if platform == 'win32': - # nb.Checkbutton( - # appearance_frame, - # text=_('Minimize to system tray'), - # variable=self.minimize_system_tray, - # command=self.themevarchanged - # ).grid(columnspan=3, padx=self.BUTTONX, sticky=tk.W, row=row.get()) # Appearance setting + if platform == 'win32': + nb.Checkbutton( + appearance_frame, + text=_('Minimize to system tray'), + variable=self.minimize_system_tray, + command=self.themevarchanged + ).grid(columnspan=3, padx=self.BUTTONX, sticky=tk.W, row=row.get()) # Appearance setting nb.Label(appearance_frame).grid(sticky=tk.W) # big spacer # LANG: Label for Settings > Appearance tab notebook.add(appearance_frame, text=_('Appearance')) # Tab heading in settings - def __setup_plugin_tab(self, notebook: Notebook) -> None: + def __setup_plugin_tab(self, notebook: Notebook) -> None: # noqa: CCR001 # Plugin settings and info plugins_frame = nb.Frame(notebook) plugins_frame.columnconfigure(0, weight=1) @@ -993,6 +994,7 @@ class PreferencesDialog(tk.Toplevel): self.cmdrchanged_alarm = self.after(1000, self.cmdrchanged) def tabchanged(self, event: tk.Event) -> None: + """Handle preferences active tab changing.""" self.outvarchanged() if platform == 'darwin': # Hack to recompute size so that buttons show up under Mojave @@ -1004,12 +1006,10 @@ class PreferencesDialog(tk.Toplevel): temp.destroy() def outvarchanged(self, event: Optional[tk.Event] = None) -> None: + """Handle Output tab variable changes.""" self.displaypath(self.outdir, self.outdir_entry) self.displaypath(self.logdir, self.logdir_entry) - logdir = self.logdir.get() - logvalid = exists(logdir) if logdir else False - self.out_label['state'] = tk.NORMAL self.out_csv_button['state'] = tk.NORMAL self.out_td_button['state'] = tk.NORMAL @@ -1029,13 +1029,13 @@ class PreferencesDialog(tk.Toplevel): from sys import platform as sys_platform directory = None if sys_platform == 'win32' and current_locale[1] not in ('utf8', 'UTF8', 'utf-8', 'UTF-8'): - def browsecallback(hwnd, uMsg, lParam, lpData): + def browsecallback(hwnd, uMsg, lParam, lpData): # noqa: N803 # Windows API convention # set initial folder if uMsg == BFFM_INITIALIZED and lpData: ctypes.windll.user32.SendMessageW(hwnd, BFFM_SETSELECTION, 1, lpData) return 0 - browseInfo = BROWSEINFO() + browseInfo = BROWSEINFO() # noqa: N806 # Windows convention browseInfo.lpszTitle = title browseInfo.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI browseInfo.lpfn = BrowseCallbackProc(browsecallback) @@ -1079,7 +1079,7 @@ class PreferencesDialog(tk.Toplevel): display = [] components = normpath(pathvar.get()).split('\\') buf = ctypes.create_unicode_buffer(MAX_PATH) - pidsRes = ctypes.c_int() + pidsRes = ctypes.c_int() # noqa: N806 # Windows convention for i in range(start, len(components)): try: if (not SHGetLocalizedName('\\'.join(components[:i+1]), buf, MAX_PATH, ctypes.byref(pidsRes)) and @@ -1258,7 +1258,7 @@ class PreferencesDialog(tk.Toplevel): config.set('ui_scale', self.ui_scale.get()) config.set('ui_transparency', self.transparency.get()) config.set('always_ontop', self.always_ontop.get()) - # config.set('minimize_system_tray', self.minimize_system_tray.get()) + config.set('minimize_system_tray', self.minimize_system_tray.get()) config.set('theme', self.theme.get()) config.set('dark_text', self.theme_colors[0]) config.set('dark_highlight', self.theme_colors[1]) @@ -1283,6 +1283,7 @@ class PreferencesDialog(tk.Toplevel): if platform == 'darwin': def enableshortcuts(self) -> None: + """Set up macOS preferences shortcut.""" self.apply() # popup System Preferences dialog try: diff --git a/requirements.txt b/requirements.txt index 01e635c5..bcf9b57d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ certifi==2021.10.8 requests==2.26.0 watchdog==2.1.6 # Commented out because this doesn't package well with py2exe -# infi.systray==0.1.12; sys_platform == 'win32' +infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep # pyyaml==5.3.1 watchdog dep semantic-version==2.8.5 diff --git a/setup.py b/setup.py index 372b4477..183a7383 100755 --- a/setup.py +++ b/setup.py @@ -197,7 +197,6 @@ elif sys.platform == 'win32': '_markerlib', 'optparse', 'PIL', - 'pkg_resources', 'simplejson', 'unittest' ], From ac824ceb1394a98c9476a314970569295612b5b3 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 12 Nov 2021 13:37:45 +0000 Subject: [PATCH 199/527] systray: Withdraw window when `oniconify()` called NB: Currently this doesn't work for the Default theme as its 'iconify' doesn't go through this function. --- EDMarketConnector.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 06fb5bc6..04d9dc57 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1751,6 +1751,11 @@ class AppWindow(object): self.w.overrideredirect(False) # Can't iconize while overrideredirect self.w.iconify() self.w.update_idletasks() # Size and windows styles get recalculated here + + # If we're meant to "minimize to system tray" then hide the window so no taskbar icon is seen + if config.get_bool('minimize_system_tray'): + self.w.withdraw() + self.w.wait_visibility() # Need main window to be re-created before returning theme.active = None # So theme will be re-applied on map From 29461dd6e31a1517bd0208f26e31e1a3e92bd42f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 12 Nov 2021 14:23:18 +0000 Subject: [PATCH 200/527] systray: Now correctly minimising to systray if required --- EDMarketConnector.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 04d9dc57..a75ee444 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -434,6 +434,7 @@ class AppWindow(object): self.w = master self.w.title(applongname) + self.minimizing = False self.w.rowconfigure(0, weight=1) self.w.columnconfigure(0, weight=1) @@ -613,6 +614,10 @@ class AppWindow(object): command=self.ontop_changed) # Appearance setting self.menubar.add_cascade(menu=self.system_menu) self.w.bind('', self.copy) + + # Bind to the Default theme minimise button + self.w.bind("", self.default_iconify) + self.w.protocol("WM_DELETE_WINDOW", self.onexit) theme.register(self.menubar) # menus and children aren't automatically registered theme.register(self.file_menu) @@ -1746,16 +1751,20 @@ class AppWindow(object): """Handle end of window dragging.""" self.drag_offset = (None, None) + def default_iconify(self, event=None) -> None: + """Handle the Windows default theme 'minimise' button.""" + # If we're meant to "minimize to system tray" then hide the window so no taskbar icon is seen + if config.get_bool('minimize_system_tray'): + # This gets called for more than the root widget, so only react to that + if str(event.widget) == '.': + self.w.withdraw() + def oniconify(self, event=None) -> None: - """Handle minimization of the application.""" + """Handle the minimize button on non-Default theme main window.""" self.w.overrideredirect(False) # Can't iconize while overrideredirect self.w.iconify() self.w.update_idletasks() # Size and windows styles get recalculated here - # If we're meant to "minimize to system tray" then hide the window so no taskbar icon is seen - if config.get_bool('minimize_system_tray'): - self.w.withdraw() - self.w.wait_visibility() # Need main window to be re-created before returning theme.active = None # So theme will be re-applied on map From f5a4469337982cdc5e94e18ab6385f124215d3cb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 12 Nov 2021 15:06:27 +0000 Subject: [PATCH 201/527] EDDN: Sanity check NavRoute contents & handle EDDN 400 * Closes #1342 - A user had a NavRoute message with no Route array. It's always from the file, so the file had to be missing it? * This results in an EDDN '400', and now we'll drop such messages from the replaylog so they're not constantly retried. --- L10n/en.template | 138 ++++++++++++++++++++++++----------------------- plugins/eddn.py | 18 +++++-- 2 files changed, 86 insertions(+), 70 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index 2851c474..872520d5 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -13,178 +13,181 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Error: Invalid Credentials"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Error: Wrong Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Error"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Error: Couldn't check token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Error: customer_id doesn't match!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Error: unable to get token"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "Frontier CAPI down for maintenance"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI query failure"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Update"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Always on top"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Unknown"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Error: Check E:D journal file location"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Ship"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Suit"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "File"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Edit"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "View"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Window"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Help"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "About {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Check for Updates..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Save Raw Data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Privacy Policy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Release Notes"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Settings"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Exit"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Copy"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Logging in..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Authentication successful"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "You're not docked at a station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Station doesn't have anything!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Station doesn't have a market!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "CAPI query aborted: Cmdr name unknown"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "CAPI query aborted: Game mode unknown"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "CAPI query aborted: Current system unknown"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI query aborted: In other-ship multi-crew"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI query aborted: CQC (Arena) detected"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Fetching data..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: No commander data returned"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Who are you?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Where are you?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "What are you flying?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Frontier CAPI server error"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +"CAPI: Refreshing access token..." = "CAPI: Refreshing access token..."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Last updated at %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "cooldown {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Shutting down..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +235,34 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB Journal processing disabled. See Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Sending data to EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Error: EDMC is too old for EDDN. Please update."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Error: Validation Failed (EDMC Too Old?). See Log"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "EDDN Error: Returned {STATUS} status code"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ +"No "Route" array in NavRoute.json contents" = "No "Route" array in NavRoute.json contents"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Send station data to the Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Send system and scan data to the Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Delay sending until docked"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "EDDN journal handler disabled. See Log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/plugins/eddn.py b/plugins/eddn.py index b4cd508d..c1c5d1f5 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -291,9 +291,6 @@ Msg:\n{msg}''' if not len(self.replaylog) % self.REPLAYFLUSH: self.flush() - # TODO: Something here needs to handle, e.g. HTTP 400, and take the message - # in question out of replaylog, else we'll keep retrying a bad message - # forever. except requests.exceptions.HTTPError as e: if unknown_schema := self.UNKNOWN_SCHEMA_RE.match(e.response.text): logger.debug(f"EDDN doesn't (yet?) know about schema: {unknown_schema['schema_name']}" @@ -303,6 +300,12 @@ Msg:\n{msg}''' self.replaylog.pop(0) # Drop the message self.flush() # Truncates the file, then writes the extant data + elif e.response.status_code == 400: + # EDDN straight up says no, so drop the message + logger.debug(f"EDDN responded '400' to the message, dropping:\n{msg!r}") + self.replaylog.pop(0) # Drop the message + self.flush() # Truncates the file, then writes the extant data + else: status['text'] = self.http_error_to_log(e) @@ -338,7 +341,7 @@ Msg:\n{msg}''' else: logger.warning(f'Unknown status code from EDDN: {status_code} -- {exception.response}') # LANG: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number - return _('EDDN Error: Returned {STATUS} status code').format(status_code) + return _('EDDN Error: Returned {STATUS} status code').format(STATUS=status_code) def export_commodities(self, data: Mapping[str, Any], is_beta: bool) -> None: # noqa: CCR001 """ @@ -959,6 +962,13 @@ Msg:\n{msg}''' # } # ] # } + + # Sanity check - Ref Issue 1342 + if 'Route' not in entry: + logger.warning(f"NavRoute didn't contain a Route array!\n{entry!r}") + # LANG: No 'Route' found in NavRoute.json file + return _('No "Route" array in NavRoute.json contents') + ####################################################################### # Elisions ####################################################################### From 33fbbd4da952c441a765527d1f9c65ca293b7dec Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 12 Nov 2021 15:36:26 +0000 Subject: [PATCH 202/527] eddn/L10n: Use single quotes in translated strings --- L10n/en.template | 2 +- plugins/eddn.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index 872520d5..9d48ba84 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -251,7 +251,7 @@ "EDDN Error: Returned {STATUS} status code" = "EDDN Error: Returned {STATUS} status code"; /* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No "Route" array in NavRoute.json contents" = "No "Route" array in NavRoute.json contents"; +"No 'Route' array in NavRoute.json contents" = "No 'Route' array in NavRoute.json contents"; /* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Send station data to the Elite Dangerous Data Network"; diff --git a/plugins/eddn.py b/plugins/eddn.py index c1c5d1f5..171807b2 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -967,7 +967,7 @@ Msg:\n{msg}''' if 'Route' not in entry: logger.warning(f"NavRoute didn't contain a Route array!\n{entry!r}") # LANG: No 'Route' found in NavRoute.json file - return _('No "Route" array in NavRoute.json contents') + return _("No 'Route' array in NavRoute.json contents") ####################################################################### # Elisions From 8af5424f9d68718af873ed85fc48a15afacc25e1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 12 Nov 2021 16:53:13 +0000 Subject: [PATCH 203/527] Revert change to PrefsVersion.stringSerial argument name It's a 'published' interface in that importing PrefsVersion is documented in PLUGINS.md, even if use of this specific function isn't. --- prefs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prefs.py b/prefs.py index 6e06f610..b6cf4b10 100644 --- a/prefs.py +++ b/prefs.py @@ -60,17 +60,17 @@ class PrefsVersion: def __init__(self): return - def stringToSerial(self, version_str: str) -> int: # noqa: N802 # used in plugins + def stringToSerial(self, versionStr: str) -> int: # noqa: N802, N803 # used in plugins """ Convert a version string into a preferences version serial number. If the version string isn't known returns the 'current' (latest) serial number. - :param version_str: + :param versionStr: :return int: """ - if version_str in self.versions: - return self.versions[version_str] + if versionStr in self.versions: + return self.versions[versionStr] return self.versions['current'] From 538c06e342a4570bbe54a78d35833674654521b6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 12 Nov 2021 18:54:35 +0000 Subject: [PATCH 204/527] systray: Out of paranoia, only .withdraw() on win32 Just in case a user gets the bright idea to set the config option manually.... --- EDMarketConnector.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index a75ee444..c0f69f08 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1754,7 +1754,7 @@ class AppWindow(object): def default_iconify(self, event=None) -> None: """Handle the Windows default theme 'minimise' button.""" # If we're meant to "minimize to system tray" then hide the window so no taskbar icon is seen - if config.get_bool('minimize_system_tray'): + if sys.platform == 'win32' and config.get_bool('minimize_system_tray'): # This gets called for more than the root widget, so only react to that if str(event.widget) == '.': self.w.withdraw() @@ -1764,7 +1764,6 @@ class AppWindow(object): self.w.overrideredirect(False) # Can't iconize while overrideredirect self.w.iconify() self.w.update_idletasks() # Size and windows styles get recalculated here - self.w.wait_visibility() # Need main window to be re-created before returning theme.active = None # So theme will be re-applied on map From 63b112975cb0e6a3bd384f0e978bc9cf68068cb6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 13 Nov 2021 10:55:36 +0000 Subject: [PATCH 205/527] Release 5.2.2: appversion & changelog --- ChangeLog.md | 40 ++++++++++++++++++++++++++++++++++++++++ config.py | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 38eebba3..756bc562 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -33,6 +33,46 @@ Developers * Now built using Python 3.9.8. +Release 5.2.2 +=== + +This release adds one new feature and addresses some bugs. We've also +updated to using Python 3.9.8. + +* Windows now has "minimize to system tray" support. + + - The system tray icon will always be present. + - There is a new option on the Settings > Appearance tab - + `Minimize to system tray`. + - When this new option is active, minimizing the application will *also* + hide the taskbar icon. + - When the new option is not active, the application will minimize to the + taskbar as normal. + +Bug Fixex +--- + +* If a CAPI query failed in such a way that no `requests.Response` object + was made available we attempted to blindly dump the non-existent object. + We now check that it actually exists, and log the specifics of the exception. + +* A user experienced the game writing a NavRoute.json file without a + `Route` array, which caused the application to attempt sending a badly formed + `navroute` message to EDDN. That message was then remembered and constantly + retried. + + - We now sanity check the NavRoute.json contents to be sure there *is* a + `Route` array, even if it is empty. If it's not present no attempt + to send the EDDN message will be made. + + If this scenario occurs the user will see a status line message `No + 'Route' array in NavRoute.json contents`. + + - For any EDDN message that receives a 400 status back we will drop it + from the replay log. + +--- + Release 5.2.1 === diff --git a/config.py b/config.py index 053eb0d7..b44edf4b 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta0' +_static_appversion = '5.2.2' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From deec91162dde65f3a07049de0d08ea1bf4b043f4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 13 Nov 2021 11:01:20 +0000 Subject: [PATCH 206/527] Release 5.2.2: Update translations --- L10n/cs.strings | 112 +++++++++++++++--------------- L10n/de.strings | 138 ++++++++++++++++++------------------ L10n/es.strings | 120 ++++++++++++++++---------------- L10n/fi.strings | 112 +++++++++++++++--------------- L10n/fr.strings | 94 ++++++++++++------------- L10n/hu.strings | 88 +++++++++++------------ L10n/it.strings | 102 +++++++++++++-------------- L10n/ja.strings | 138 ++++++++++++++++++------------------ L10n/ko.strings | 132 +++++++++++++++++------------------ L10n/lv.strings | 86 +++++++++++------------ L10n/nl.strings | 92 ++++++++++++------------ L10n/pl.strings | 135 ++++++++++++++++++------------------ L10n/pt-BR.strings | 132 +++++++++++++++++------------------ L10n/pt-PT.strings | 132 +++++++++++++++++------------------ L10n/ru.strings | 138 ++++++++++++++++++------------------ L10n/sl.strings | 74 ++++++++++---------- L10n/sr-Latn-BA.strings | 150 ++++++++++++++++++++++++---------------- L10n/sr-Latn.strings | 138 ++++++++++++++++++------------------ L10n/sv-SE.strings | 92 ++++++++++++------------ L10n/uk.strings | 108 ++++++++++++++--------------- L10n/zh-Hans.strings | 120 ++++++++++++++++---------------- 21 files changed, 1245 insertions(+), 1188 deletions(-) diff --git a/L10n/cs.strings b/L10n/cs.strings index 5dc62b4a..50d11fc0 100644 --- a/L10n/cs.strings +++ b/L10n/cs.strings @@ -10,157 +10,157 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Chyba: Chybné přihlašovací údaje"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Chyba: Nesprávný CMDR"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Chyba"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Chyba: Nejde ověřit token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Chyba: customer_id nesouhlasí!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Chyba: nepovedlo se získat token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Dotaz na Frontier CAPI selhal"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Aktualizovat"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Vždy navrchu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Neznámý"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Loď"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Oblek"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Systém"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stanice"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Soubor"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Upravit"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Zobrazit"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Nápověda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Zkontrolovat aktualizace..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Uložit surová data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Zásady ochrany osobních údajů"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Poznámky k verzi"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Nastavení"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Ukončit"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentace"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopírovat"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Přihlašování..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Přihlášení bylo úspěšné"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Nejste zadokováni ve stanici!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Stanice nenabízí žádné služby!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Stanice nemá obchod!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Načítání dat..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Nebyla vrácena žádná data komandéra"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Kdo jste?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Kde zrovna jste?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "S jakou lodí létáte?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Chyba Frontier CAPI serveru"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Poslední aktualizace %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Počkej ještě {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Vypínání..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jeden nebo více aktivních pluginů ještě stále nepodporuje Python 3.x. Podívejte se na jejich seznam v záložce '{PLUGINS}' v '{FILE}' > '{SETTINGS}'. Zkontrolujte si jestli není dostupná novější verze pluginu, pokud ne, tak kontaktujte vývojáře pluginu o tom, že musí upravit jejich plugin pro Python 3.x.\n\nPlugin můžete vypnout přidáním '{DISABLED}' na konec názvu jeho složky."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy, které nepodporují Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -208,22 +208,22 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Zpracování EDDB deníku je deaktivováno. Zkontrolujte log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Odesílání dat do EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Chyba: Nelze se připojit k EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Odeslat data o stanici do Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Odeslat sken a data o systému do Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Pozdržet odeslání po zadokování"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "Obsluha EDDN deníku je deaktivována. Zkontrolujte log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/de.strings b/L10n/de.strings index 83a5963f..6f7d00de 100644 --- a/L10n/de.strings +++ b/L10n/de.strings @@ -13,178 +13,181 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Fehler: Ungültige Anmeldedaten"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Fehler: Falscher Kdt."; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Fehler"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Fehler: Konnte das Token customer_id nicht prüfen"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Fehler: customer_id stimmt nicht überein!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Fehler: konnte Token nicht erhalten"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "Frontier CAPI offline wegen Wartung"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI Anfrage gescheitert"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Aktualisieren"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Immer im Vordergrund"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Unbekannt"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Fehler: Prüfe E:D Journal Dateispeicherort"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Kdt."; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Rolle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Schiff"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Anzug"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Datei"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Bearbeiten"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Ansicht"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Fenster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Hilfe"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Über {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Auf Aktualisierungen überprüfen..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Speichere Originaldaten..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Datenschutzrichtlinie"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Anmerkungen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Einstellungen"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Beenden"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopieren"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Anmelden..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Authentifizierung erfolgreich"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Du bist an keiner Station angedockt!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Diese Station hat nichts!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Diese Station hat keinen Markt!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "CAPI Anfrage abgebrochen: Kdt. Name unbekannt"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "CAPI Anfrage abgebrochen: Spielmodus unbekannt"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "CAPI Anfrage abgebrochen: Aktuelles System unbekannt"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI Anfrage abgebrochen: In anderem Schiff in Multicrew"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI Anfrage abgebrochen: CQC (Arena) erkannt"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Daten werden abgerufen..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Keine Kommandanten-Daten erhalten"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Wer bist du?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Wo bist du?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Was fliegst du?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Frontier CAPI Server-Fehler"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +"CAPI: Refreshing access token..." = "CAPI: Erneuere Access-Token..."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Zuletzt aktualisiert um %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Kanonier"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Steuer"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Wartezeit {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Programm schließt..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Eins oder mehr deiner aktivierten Plugins hat noch keinen Support für Python 3.x. Du kannst dir die Liste im '{PLUGINS}'-Tab unter '{FILE}' > '{SETTINGS}' ansehen. Du solltest prüfen, ob es für diese Updates gibt und ansonsten dem Entwickler Bescheid geben, dass sie ihren Code für Python 3.x aktualisieren müssen.\n\nDu kannst ein Plugin deaktivieren, indem du dessen Ordner ein '{DISABLED}' am Ende des Namens anhängst."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins ohne Python 3.x Support"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +235,34 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB Journal-Verarbeitung deaktiviert. Siehe Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Daten werden an das EDDN gesendet..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Fehler: Keine Verbindung zum EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN-Fehler: EDMC ist zu alt für EDDN. Bitte aktualisieren."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN-Fehler: Validierung fehlgeschlagen (EDMC zu alt?). Siehe Log"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "EDDN-Fehler: {STATUS} Statuscode zurückgegeben"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ +"No 'Route' array in NavRoute.json contents" = "Kein 'Route'-Array in NavRoute.json enthalten"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Schicke Stationsdaten an das Elite Dangerous Data Netzwerk"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Sende System- und Scandaten zum Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Senden verzögern bis angedockt"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "EDDN Journal-Handler deaktiviert. Siehe Log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/es.strings b/L10n/es.strings index 22ac976d..cfa72d90 100644 --- a/L10n/es.strings +++ b/L10n/es.strings @@ -13,160 +13,160 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Error: Credenciales Inválidas"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Error: Cmdt Incorrecto"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Error"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Error: No se pudo comprobar el token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Error: ¡customer_id no coincide!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Error: no se pudo conseguir el token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Fallo de consulta del CAPI de Frontier"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Actualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Siempre visible"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Desconocido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Error: Comprueba la localización del fichero journal de E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Estación"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Archivo"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Visualización"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Ventana"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Ayuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Acerca de {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Buscar Actualizaciones..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Guardar Datos Sin Procesar..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Estado"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Política de Privacidad"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Notas de la versión"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Configuración"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Salir"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Documentación"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Identificándose..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autenticación correcta"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "¡No estás atracado en una estación!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "¡La estación no tiene nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "¡La estación no tiene mercado!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Recopilando datos..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: No se devolvió datos de comandante"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "¿Quién eres?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "¿Dónde estás?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "¿Qué estás volando?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Error de servidor CAPI de Frontier"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Última actualización: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Caza"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Artillero"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Timón"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Espere {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "Aceptar"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Apagando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o más de tus plugins habilitados aún no tienen soporte para Python 3.x. Por favor, consulta la lista en la pestaña '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Deberías comprobar si hay una versión actualizada disponible, si no, avisa al desarrollador de que necesita actualizar el código para Python 3.x.\n\nPuedes deshabilitar un plugin cambiando el nombre de su carpeta para que tenga '{DISABLED}' al final del nombre."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Sin Soporte para Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -214,31 +214,31 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Procesamiento de Journal para EDDB desactivado. Ver Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Enviando datos a EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Error: No se puede conectar a EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Error EDDN: EDMC es demasiado antiguo para EDDN. Actualiza por favor."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Error EDDN: Validación Fallida (¿EDMC Demasiado Antiguo?). Revisa el Log"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "Error EDDN: Devolvió código de estado {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Enviar datos de la estación a Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Enviar datos de sistema y escáner a Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Retrasar envío hasta el atraque"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "Manejo de Journal para EDDN desactivado. Ver Log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/fi.strings b/L10n/fi.strings index 7a463158..bb11ba43 100644 --- a/L10n/fi.strings +++ b/L10n/fi.strings @@ -10,157 +10,157 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Virhe: kirjautuminen ei kelpaa"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Virhe: väärä komentaja"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Virhe"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Virhe: Ei kyetty tarkastamaan polettia customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Virhe: customer_id ei löydy vastaavuutta!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Virhe: ei kyetty saamaan polettia"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI kyselyvirhe."; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Päivitä"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Aina päällimmäisenä"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Tuntematon"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Rooli"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Alus"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Asuste"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Järjestelmä"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Asema"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Tiedosto"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Muokkaa"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Näytä"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Ikkuna"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Apua"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Ohjelmasta {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Tarkista päivitykset..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Tallenna raakadata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Tila"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Tietosuojakäytäntö"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Julkaisutiedot"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Valinnat"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Lopeta"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentaatio"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopioi"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Kirjaudutaan..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Todennus onnistui"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Et ole telakoituneena asemalle!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Asemalla ei ole mitään!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Asemalla ei ole kaupankäyntiä!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Noudetaan tietoja..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: tietoja ei löytynyt"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Kuka olet?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Missä olet?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Mitä alusta lennät?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Frontier CAPI palvelinvirhe."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Päivitetty viimeksi %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Hävittäjä"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Aseiden käyttäjä"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Pilotti"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Jäähtymisaika {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Sulkeutuu..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Yksi tai useampi käyttämistäsi lisäosista ei sisällä vielä Pyhton 3.x -tukea. Tarkista tiedoston '{FILE}' > '{SETTINGS}' välilehti '{PLUGINS}' lisäosista, onko niistä uudempaa versiota saatavilla; muussa tapauksessa ota yhteyttä sen kehittäjään ja kerro, että sen lähdekoodi on päivitettävä Python 3.x -tasolle.\n\nVoit estää lisäosan toiminnan nimeämällä sen hakemiston siten, että se päättyy tekstiin '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Lisäosat"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Lisäosat ilman Python 3.x -tukea"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -181,22 +181,22 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB lokikirjan käsittely ei käytössä. Katso lokitiedot."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Lähetetään tietoja EDDN:ään..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Virhe: ei saatu yhteyttä EDDN:ään"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Lähetä asematiedot Elite Dangerous Data Network -palveluun"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Lähetä järjestelmä- ja skannaustiedot Elite Dangerous Data Network -palveluun"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Lähetä tiedot vasta telakoitumisen jälkeen"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "EDDB lokikirjan käsittelijä ei käytössä. Katso lokitiedot."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/fr.strings b/L10n/fr.strings index c6fbee13..ae736fd9 100644 --- a/L10n/fr.strings +++ b/L10n/fr.strings @@ -7,148 +7,148 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Erreur : Identifiants invalides"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Erreur : Cmdr incorrect"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Mettre à jour"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Toujours visible"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmd"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Rôle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Vaisseau"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Combinaison"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Système"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Fichier"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Édition"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Présentation"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Fenêtre"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Aide"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "À propos de {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Chercher une mise à jour..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Sauvegarder les Données Brutes..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "État"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Politique de Confidentialité"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Notes de publication"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Paramètres"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Quitter"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Copier"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Connexion en cours..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Authentification réussie"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Vous n'êtes pas amarré à une station !"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "La station n'a rien du tout !"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "La station n'a pas de marché !"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Récupération des données..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Qui êtes-vous ?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Où êtes-vous ?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Avec quoi volez-vous ?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Dernière mise à jour à %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Chasseur"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Artilleur"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Pilote"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Temps de recharge {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Un ou plusieurs de vos plugins activés ne sont pas encore compatibles avec Python 3.x. Regardez la liste sur l'onglet '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Vous devriez vérifier s'il y a une version mise à jour, sinon alertez le développeur qu'il doit mettre à jour le code pour Python 3.x.\n\nVous pouvez désactiver un plugin en renommant son dossier pour qu'il ait '{DISABLED}' à la fin du nom."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins non compatibles avec Python 3.x"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Par défaut"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Envoi des données à EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Erreur : Connexion impossible à EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Envoyer les données de la station à Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Envoyer les systèmes et les informations de scan à Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Retarder l'envoi jusqu'à l'amarrage"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/hu.strings b/L10n/hu.strings index 34055ac0..a7ae12cb 100644 --- a/L10n/hu.strings +++ b/L10n/hu.strings @@ -7,139 +7,139 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Hiba:Érvénytelen hitelesítő adatok"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Hiba:Rossz parancsnok"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Frissítés"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Mindig felül"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Parancsnok"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Szerep"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Hajó"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Rendszer"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Állomás"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Fájl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Szerkeszt"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Nézet"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Ablak"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Segítség"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Az {APP} névjegye"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Frissítések keresése"; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Nyers adat elmentése"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Státusz"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Adatvédelmi irányelvek"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Kiadási megjegyzések"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Beállítások"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Kilépés"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentáció"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Másol"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Bejelentkezés"; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "A hitelesítés sikerült"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = " Nem dokkoltál az állomáson"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Az állomáson nincs semmi!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Nincs piac az állomáson!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Adatok lekérése"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Ki vagy?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Hol vagy?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Mivel repülsz?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Utoljára frissítve %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Vadászgép"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Lövész"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Kormányos"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Lehűl {SS} másodperc"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "Ok"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Pluginok"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Alap"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Adatok küldése az EDDN-nek..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Hiba:Nem lehet kapcsolódni az EDDN-hez"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Állomás adatok küldése az EDDN-nek"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Rendszer és szken adatok küldése az EDDN-nek"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Küldés késletetése amig dokkolsz"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/it.strings b/L10n/it.strings index 928e5b89..c3e8fe7d 100644 --- a/L10n/it.strings +++ b/L10n/it.strings @@ -7,145 +7,145 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Errore: Credenziali non valide"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Errore: Cmdr sbagliato"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Errore"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Recupera"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Sempre in primo piano"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Sconosciuto"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Ruolo"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Tuta"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stazione"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "File"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Appunti"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Vista"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Finestra"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Guida"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Informazioni su {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Controlla aggiornamenti..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Salva i Dati Grezzi..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Informativa sulla privacy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Note di rilascio"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Impostazioni"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Esci"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Documentazione"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Copia"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Mi sto loggando..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autenticazione riuscita"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Non sei parcheggiato in nessuna stazione !"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "La Stazione non ha niente !"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "La Stazione non ha un Market !"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Sto raccogliendo i dati..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Nessun dato sul commandante"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Chi sei ?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Dove sei finito ?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Stai volando ?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Errore nel server Frontier CAPI"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Ultimo aggiornamento alle %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Cacciatore"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Artigliere"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Timoniere"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "disponibile tra {SS} secondi"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Spegnimento..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o più dei tuoi plugin non ha ancora il supporto per Python 3.x. Per favore guarda la lista '{PLUGINS}' nella tab a '{FILE}' > '{SETTINGS}'. Dovresti controllare se ci sono aggiornamenti, altrimenti avvisa gli sviluppatori che devono aggiornare il codice a Python 3.x.\n\nPuoi disabilitare il plugin rinominando la cartella aggiungendo '{DISABLED}' alla fine del nome."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins senza Supporto Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -187,19 +187,19 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Elaborazione di EDDB Journal disabilitata. Guarda il Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Sto inviando i dati a EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Errore: Non riesco a connettermi a EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Manda i dati della stazione a Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Manda il sistema e i dati scansionati a EDDN"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Ritarda l'invio fino a che si è ormeggiati"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/ja.strings b/L10n/ja.strings index 9fce4e1f..02e4aed2 100644 --- a/L10n/ja.strings +++ b/L10n/ja.strings @@ -13,178 +13,181 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "エラー: 認証情報に誤りがあります"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "エラー: 不適切なCmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "エラー"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "エラー: customer_idトークンを確認できませんでした"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "エラー: customer_idがマッチしません!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "エラー: トークンが取得できません"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "Frontier CAPIがメンテナンスのため停止中"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPIクエリ失敗"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "更新"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "常に最前面に表示する"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "不明"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "エラー: E:Dジャーナルファイルの場所を確認してください"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "コマンダー"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "役割"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "船"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "スーツ"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "ステーション"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "ファイル"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "編集"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "表示"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "ウィンドウ"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "ヘルプ"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "{APP} について"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "更新の確認..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "生データの保存..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "ステータス"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "プライバシーポリシー"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "リリースノート"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "設定"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "終了"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "ドキュメント"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "コピー"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "ログイン中..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "認証成功"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "ステーションにドッキングしていません!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "このステーションには何も商品がありません!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "このステーションには市場がありません!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "CAPIクエリ中止: CMDR名が不明"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "CAPIクエリ中止: ゲームモードが不明"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "CAPIクエリ中止: 現システムが不明"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "CAPIクエリ中止: 他の船でマルチクルー中"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "CAPIクエリ中止: CQC(Arena)が検出"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "データを取得中..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: コマンダーのデータが返ってきませんでした"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "どなたですか?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "どこにいますか?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "どの船で飛行していますか?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Frontier CAPIサーバエラー"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +"CAPI: Refreshing access token..." = "CAPI: アクセストークンを更新中..."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "最終更新時間 %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "次回更新まであと {SS}秒"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "了解"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "終了します..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "有効にしている1つ以上のプラグインがPython 3.xをサポートしていません。'{FILE}' > '{SETTINGS}'\nメニューで表示される設定ダイアログの'{PLUGINS}' タブの一覧を確認してください。更新済みのバージョンがあるかを確認し、なければ開発者にPython 3.xに対応するように開発者に連絡してください。\n\nプラグインを無効にするにはフォルダ名の最後に'{DISABLED}'を追加してください。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "プラグイン"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: プラグインがPython 3.xをサポートしていません"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +235,34 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDBジャーナル処理が無効です。ログを確認してください。"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "EDDNにデータ送信中..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "エラー: EDDNに接続できません"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDNエラー: EDDNで使用するにはEDMCのバージョンが古すぎます。更新してください。"; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDNエラー: 検証に失敗しました(EDMCが古すぎる?)。ログを確認してください。"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "EDDNエラー: ステータスコード {STATUS} が返されました"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ +"No 'Route' array in NavRoute.json contents" = "NavRoute.jsonにRoute配列が存在しません"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkにステーションデータを送信する"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkに星系やスキャンした星のデータを送信する"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "ドッキングするまでデータを送信しない"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "EDDNジャーナルハンドラーが無効です。ログを確認してください。"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/ko.strings b/L10n/ko.strings index 78f03306..73a249be 100644 --- a/L10n/ko.strings +++ b/L10n/ko.strings @@ -13,178 +13,178 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "오류: 잘못된 자격 증명"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "오류: 잘못된 커맨더"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "오류"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "오류: customer_id 토큰을 확인할 수 없었음"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "오류: customer_id가 일치하지 않습니다!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "오류: 토큰을 받지 못함"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "Frontier CAPI 점검으로 접속 불가"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI 쿼리 실패"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "새로 고침"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "항상 위에 보이기"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "알 수 없음"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "오류: E:D 저널 파일의 위치를 확인하십시오"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "커맨더"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "함선"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "슈트"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "성계"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "스테이션"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "파일"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "편집"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "보기"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "창"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "도움말"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "{APP} 정보"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "업데이트 확인하기..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Raw 데이터 저장하기..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "상태"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "개인정보처리방침"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "릴리즈 노트"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "설정"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "종료"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "문서 자료"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "복사"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "로그인하는 중..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "인증 성공"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "스테이션에 도킹되어 있지 않습니다!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "스테이션에 아무것도 없습니다!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "스테이션에 마켓이 없습니다!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "CAPI 쿼리 중단: 커맨더 이름 알 수 없음"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "CAPI 쿼리 중단: 게임 모드 알 수 없음"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "CAPI 쿼리 중단: 현재 성계 알 수 없음"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI 쿼리 중단: 다른 함선의 멀티크루로 참여중"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI 쿼리 중단: CQC(아레나) 감지됨"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "데이터 가져오는 중..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: 커맨더 정보가 반환되지 않음"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "당신은 누구시죠?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "어디 계신거죠?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "지금 어떤 함선을 몰고 계신 건가요?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Frontier CAPI 서버 오류"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "마지막 업데이트: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "쿨다운 {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "종료하는 중..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "활성화된 플러그인 중 1개 이상이 Python 3.x를 지원하지 않습니다. '{FILE}' > '{SETTINGS}' 에서 '{PLUGINS}' 탭에 들어가 활성화되어있는 플러그인 목록을 확인하십시오. 플러그인들 중 새 버전이 나온 것이 있는지도 확인해보시고, 만약 3.x를 지원하지도, 새 버전도 없다면 해당 플러그인의 개발자에게 코드를 수정하기를 문의하십시오.\n\n플러그인을 비활성화하려면 '{DISABLED}'를 폴더명 뒤에 추가하면 됩니다."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "플러그인"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Python 3.x을 지원하지 않는 플러그인"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +232,31 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB 저널 처리 비활성화됨. 로그 참고 바람."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "EDDN에 정보 전송하는 중..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "오류: EDDN에 연결할 수 없음"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 오류: EDDN에 접속하기에 EDMC의 버전이 너무 오래되었습니다. 업데이트하시기 바랍니다."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 오류: 인증 실패 (EDMC가 너무 오래되었을 수 있음). 로그 참고"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "EDDN 오류: 상태 코드 {STATUS}가 반환됨"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 스테이션 정보 전송하기"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 시스템 및 스캔 정보 전송하기"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "도킹시까지 서버에 정보 전송을 미루기"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "EDDN 저널 처리 비활성화됨. 로그 참고 바람."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/lv.strings b/L10n/lv.strings index 2d32d179..cb0dbe91 100644 --- a/L10n/lv.strings +++ b/L10n/lv.strings @@ -7,136 +7,136 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Kļūda: Nederīga lietotāja informācija"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Atjaunināt"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Vienmēr virspusē"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Loma"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Kuģis"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistēma"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stacija"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Fails"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Labot"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Skats"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Logs"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Palīdzība"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Par {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Pārbaudīt atjauninājumus..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Saglabāt sākotnējos datus..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Statuss"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Privātuma politika"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Informācija par laidienu"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Iestatījumi"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Iziet"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentācija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopēt"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Autorizējas..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autentifikācija sekmīga"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Jūs neesat stacijā!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Stacijā nekā nav!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Stacijā nav tirgus!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Iegūst datus..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Kas tu esi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Kur tu esi?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Ar ko tu lido?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Pēdējo reizi atjaunināts %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Cīnītājs"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Ložmetējnieks"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Stūre"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Atskaite {SS}"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "Labi"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Spraudņi"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Noklusējuma"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Sūta datus uz EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Kļūda: Nevar savienoties ar EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Aizkavēt sūtīšanu līdz nosēšanai"; /* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ diff --git a/L10n/nl.strings b/L10n/nl.strings index 8aa3006b..9e14e600 100644 --- a/L10n/nl.strings +++ b/L10n/nl.strings @@ -7,145 +7,145 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Fout: Ongeldige inlog gegevens"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Fout: Verkeerde Cmdr"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Bijwerken"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Altijd op voorgrond"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Schip"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Systeem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Bestand"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Bewerken"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Beeld"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Venster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Help"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Over {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Controleren op updates..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Sla onbewerkte gegevens op..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Privacybeleid"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Release opmerkingen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Instellingen"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Afsluiten"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Documentatie"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopieëren"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Bezig met inloggen..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Authenticatie voltooid"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Je bent niet gedockt in een station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Station heeft helemaal niets!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Station heeft geen markt!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Data wordt opgehaald..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Wie ben je?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Waar ben je?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Waar vlieg je in?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Voor het laatst bijgewerkt om %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Gevechtsvlieger"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Schutter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Stuurman"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "wachtperiode {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Een of meer ingeschakelde plugins hebben nog geen Python 3.x ondersteuning. Kijk op de lijst op de '{PLUGINS}' tab van '{FILE}' > '{SETTINGS}'. Check of er een bijgewerkte versie beschikbaar is. Laat anders de developer weten dat ze de code moeten updaten voor Python 3.x.\n\nJe kan de plugin uitschakelen door het mapje te hernoemen met '{DISABLED}' aan het eind van de naam."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMS: Plugins zonder Python 3.x ondersteuning"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Standaard"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Bezig data te versturen naar EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Fout: Kan geen verbinding maken met EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Stuur station gegevens naar het Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Stuur systeem en scan gegevens naar het Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Stel verzending uit tot na het docken"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/pl.strings b/L10n/pl.strings index 9d6d9a2c..c9af3ee2 100644 --- a/L10n/pl.strings +++ b/L10n/pl.strings @@ -13,178 +13,181 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Błąd: Dane uwierzytelniające niepoprawne"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Błąd: Niepoprawny Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Błąd"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Błąd: Nie można sprawdzić ID klienta z tokenu"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Błąd: ID klienta nie pasuje!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Błąd: Nie można pobrać tokenu"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "CAPI w trakcie prac serwisowych"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Błąd zapytania CAPI Frontier"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Aktualizacja"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Zawsze na wierzchu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Nieznany"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Błąd: Sprawdź lokalizację pliku dziennika E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Rola"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Statek"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Kombinezon"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stacja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Plik"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Edycja"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Widok"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Pomoc"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "{APP}..."; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Sprawdź aktualizacje..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Zapisz Nieprzetworzone Dane..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Polityka prywatności"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Informacje o wersji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Ustawienia"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Zakończ"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentacja"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiuj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Logowanie..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autoryzacja pomyślna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Nie jesteś zadokowany do stacji!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Stacja jest pusta!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "W stacji nie ma giełdy towarowej!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "Zapytanie CAPI anulowane: nazwa komandora nieznana"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "Zapytanie CAPI anulowane: tryb gry nieznany"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "Zapytanie CAPI anulowane: obecny system nieznany"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "Zapytanie CAPI anulowane: jako załogant w innym statku"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "Zapytanie CAPI anulowane: wykryto arenę CQC"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Pobieranie danych..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Nie zwrócono danych dowódcy"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Kim jesteś?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Gdzie jesteś?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Czym latasz?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Błąd serwera CAPI Frontier"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +"CAPI: Refreshing access token..." = "CAPI: Odświeżanie tokena dostępu..."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Ostatnia aktualizacja %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Oczekiwanie {SS} sek."; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Wyłączanie..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Co najmniej jeden z uruchomionych pluginów nie wspiera Python 3.x. Sprawdź listę w '{FILE}' > '{SETTINGS}', sekcja '{PLUGINS}'. Upewnij się, że dostępna jest aktualna wersja pluginu, w przeciwnym razie poinformuj twórcę, że należy zaktualizować kod do wersji Python 3.x.\n\nMożesz wyłączyć plugin, dodając '{DISABLED}' na koniec nazwy jego folderu."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy Nie Wspierające Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +235,31 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Wyłączone przetwarzanie dziennika EDDB. Sprawdź logi."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Wysłanie danych do EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Błąd: Brak połączenia z EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Błąd EDDN: Zbyt stara wersja EDMC. Zaktualizuj do nowszej wersji."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Błąd EDDN: Nieudana weryfikacja (stara wersja EDDN?). Sprawdź logi."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "Błąd EDDN: Zwrócono kod {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Wyślij dane do Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Wyślij dane skanowań do EDDN"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Czekaj z wysłaniem na zadokowanie"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "Wyłączona obsługa dziennika EDDB. Sprawdź logi."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/pt-BR.strings b/L10n/pt-BR.strings index f7bf8702..35a200b6 100644 --- a/L10n/pt-BR.strings +++ b/L10n/pt-BR.strings @@ -13,178 +13,178 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Erro: Cmdt Errado"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Erro"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Erro: não foi possível verificar o token customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Erro: customer_id diferente!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Erro: não foi possível obter o token"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "CAPI da Frontier indisponível por manutenção"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Falha na requisição ao CAPI da Frontier"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Atualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Sempre no topo"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Desconhecido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Erro: Verifique a localicação dos arquivos de Jornais E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Arquivo"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Visualizar"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Janela"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Ajuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Sobre {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Verificar por Atualizações..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Salvar dados brutos..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Política de Privacidade"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Notas de atualização"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Configurações"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Sair"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Efetuando login..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autenticação bem-sucedida"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Você não está docado na estação!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "A estação não tem nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "A estação não tem um mercado!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "Requisição CAPI cancelada: nome de CMDT desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "Requisição CAPI cancelada: modo de jogo desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "Requisição CAPI cancelada: sistema atual desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "Requisição CAPI cancelada: em multi-crew em outra nave"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "Requisição CAPI cancelada: CQC (Arena) detectado"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Nenhum dado de comandante retornado"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Quem é você?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Onde está você?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "No que você está voando?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Erro de servidor do CAPI da Frontier"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Última atualização %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Caça"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Artilheiro"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Comando"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "aguarde {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Encerrando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins habilitados não possuem suporte ao Python 3.x. Você pode ver a lista na guia '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Você deve verificar se existe versão atualizada ou então avisar o desenvolvedor de que ele precisa atualizar o código para o Python 3.x.\n\nVocê pode desabilitar um plugin renomeando sua pasta para que seu nome termine com '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem Suporte ao Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +232,31 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Processamento de Jornais no EDDB desativado. Verifique o Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Enviando log para o EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Erro: Não é possível conectar-se ao EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: o EDMC é muito antigo para o EDDN. Por favor, atualize."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (EDMC antigo?). Verifique o log."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "Erro EDDN: retornou o código {STATUS}."; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Enviar log da estação para o EDDN"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Enviar sistemas e dados escaneados para o EDDN"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Atrasar o envio até estar docado"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "Manipulador de Jornais do EDDN desativado. Verique o Log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/pt-PT.strings b/L10n/pt-PT.strings index 715369ef..0cc84896 100644 --- a/L10n/pt-PT.strings +++ b/L10n/pt-PT.strings @@ -13,178 +13,178 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Erro: Cmdt errado"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Erro"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Erro: Impossível verificar o token de customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Erro: customer_id não foi encontrado!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Erro: Não é possível obter o token"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "CAPI da Frontier em manutenção."; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Falha ao consultar a CAPI da Frontier."; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Actualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Sempre por cima"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Desconhecido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Erro: Verifique a localização do ficheiro do diário E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Fato"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Ficheiro"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Ver"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Janela"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Ajuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Sobre {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Procurar por Actualizações..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Salvar dados em bruto..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Estado"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Política de Privacidade"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Notas da Versão"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Definições"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Sair"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Realizando login..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autenticação bem-sucedida"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Não está atracado numa Estação"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "A Estação não tem nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "A Estação não possui um mercado!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "Consulta à CAPI abortada: Nome do Comandante desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "Consulta à CAPI abortada: Modo de Jogo desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "Consulta à CAPI abortada: Sistema actual desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "Consulta à CAPI abortada: Jogador em multi-tripulação noutra nave."; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "Consulta à CAPI abortada: CQC (Arena) detectada."; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Dados do Comandante não recebidos"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Quem é você?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Onde é que está?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "No que é que está a voar?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Erro do servidor CAPI da Frontier."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Última actualização: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Caça"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Artilheiro"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Comando"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "aguarde {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "A Desligar..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins activados não possui ainda suporte para Python 3.x. Por favor verifique a lista na aba '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Deverá verificar se está disponível uma versão mais actualizada, caso contrário, informe o desenvolvedor de que necessita de actualizar o código para suportar Python 3.x.\n\nPode desactivar um plugin colocando '{DISABLED}' no fim do nome da pasta correspondente."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem suporte para Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +232,31 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Processamento do diário do EDDB desactivado. Verifique o ficheiro de registos."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "A enviar dados para o EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Erro: Não é possível conectar ao EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: Versão do EDMC é demasiado antiga para usar com a EDDN. Por favor actualize."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (Versão do EDMC demasiado antiga?). Verifique os ficheiros de registo."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "Erro EDDN: Recebido código de estado {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Enviar dados da estação para o Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Envia dados do Sistema e Scans efectuados para o Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Atrasar o envio até estar atracado"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "Gestor do diário do EDDN desactivado. Verifique o ficheiro de registos."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/ru.strings b/L10n/ru.strings index 0b025a6a..127a315d 100644 --- a/L10n/ru.strings +++ b/L10n/ru.strings @@ -13,178 +13,181 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Ошибка: неизвестное имя пользователя или неверный пароль"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Ошибка: неверное имя командира"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Ошибка"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Ошибка: невозможно проверить токен customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Ошибка: customer_id не совпадает!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Ошибка: не удается получить токен"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "Frontier CAPI остановлен для технического обслуживания"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Неудача при запросе к Frontier CAPI"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Обновить данные"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Поверх остальных окон"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Неизвестно"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Ошибка: проверьте расположение журналов E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "КМДР"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Роль"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Корабль"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Станция"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Файл"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Правка"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Вид"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Окно"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Дополнительно"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "О программе {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Проверить наличие обновлений..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Сохранить \"сырые\" данные.."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Статус"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Политика конфиденциальности"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Заметки о текущем релизе"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Настройки"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Выход"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Информация о плагине"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Копировать"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Идет подключение..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Аутентификация успешно завершена"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Ваш корабль не пристыкован к станции!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "На текущей станции никакие услуги не предоставляются!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "На текущей станции рынок недоступен!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "Запрос CAPI прерван: Имя командира неизвестно"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "Запрос CAPI прерван: Игровой режим неизвестен"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "Запрос CAPI прерван: Текущая система неизвестна"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "Запрос CAPI прерван: В мультиэкипаже другого корабля"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "Запрос CAPI прерван: Обнаружен CQC (Арена)"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Получение данных..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Нет данных пилота"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Невозможно определить личность командира!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Невозможно определить местоположение!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Невозможно определить тип корабля!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Серверная ошибка Frontier CAPI"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +"CAPI: Refreshing access token..." = "CAPI: Обновление access токена"; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Последнее обновление в %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Истребитель"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Стрелок"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Командир корабля"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "пауза {SS} сек"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Выключение..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один или несколько ваших подключённых плагинов ещё не имеют поддержки Python 3.x. Пожалуйста, ознакомьтесь со списком во вкладке '{PLUGINS}' '{FILE}' > '{SETTINGS}'. Вы должны проверить наличие обновлённой версии, в противном случае предупредите разработчика о необходимости обновления кода на Python 3.x.\n\nВы можете отключить плагин, переименовав его папку в '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Плагины"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Без поддержки Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +235,34 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Обработка журнала EDDB отключена. См. логи."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Отправка данных на EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Ошибка: не удается подключиться к EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "Ошибка EDDN: старая версия EDMC, обновитесь до последней."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Ошибка EDDN: Неудачная валидация (старая версия EDMC?). См. логи."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "Ошибка EDDN: Возвращён статус код {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ +"No 'Route' array in NavRoute.json contents" = "Нет Route массива в NavRoute.json"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Отправлять информацию о станциях на Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Отправлять данные о системе и данные сканирования в Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Отложить отправку данных до завершения стыковки"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "Обработчик журнала EDDN отключен. См. логи."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/sl.strings b/L10n/sl.strings index 503162ef..0b37f62c 100644 --- a/L10n/sl.strings +++ b/L10n/sl.strings @@ -4,118 +4,118 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Napaka: napačno uporabniški ime ali geslo"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Osveži"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Vedno na vrhu"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Vloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Ladja"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Postaja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Datoteka"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Uredi"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Pomoč"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Preveri posodobitve..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Shrani Izvirne Podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Pravilnik o zasebnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Opombe ob izdaji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Nastavitve"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Izhod"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Prijava v teku... "; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Preverjanje pristnosti je bilo uspešno"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Nahajš se v postaji!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Postaja nima ničesar"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Postaja nima trga"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Nalagam podatke..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Kdo si"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Kje se nahajaš"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "S čim letiš"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Zadnja osvežitev podatkov %H:%M:%S "; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Posodobitev v {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "Potrdi"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Privzeta"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Pošiljam podatke na EDDN"; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Napaka: povezava z EDDN ni mogoča"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Pošlji podatke postaje na EDDN"; /* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ diff --git a/L10n/sr-Latn-BA.strings b/L10n/sr-Latn-BA.strings index ec854aef..17f7c40d 100644 --- a/L10n/sr-Latn-BA.strings +++ b/L10n/sr-Latn-BA.strings @@ -13,160 +13,181 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Greška: Neispravni kredencijali"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Greška"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Greška: Nemoguća provjera tokena customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Greška: Nemoguće dobaviti token"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI nedostupan zbog održavanja"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI neuspješan upit"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Osvježi"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Uvijek na vrhu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Nepoznato"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Greška: Provjerite lokaciju E:D journal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Brod"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Odijelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Fajl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Uredi"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Prozor"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Pomoć"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Provjeri nadogradnje..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Politika privatnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Informacije o verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Podešavanja"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Izlaz"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Prijavljivanje..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autentifikacija uspješna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Niste pristali na stanicu"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Stanica nema ništa!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Stanica nema market!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +"CAPI query aborted: Cmdr name unknown" = "CAPI upit prekinut: nepoznato ime komandanta"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +"CAPI query aborted: Game mode unknown" = "CAPI upit prekinut: nepoznat režim igre"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +"CAPI query aborted: Current system unknown" = "CAPI upit prekinut: nepoznat trenutni sistem"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +"CAPI query aborted: In other-ship multi-crew" = "CAPI upit prekinut: u višečlanoj posadi drugog broda"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +"CAPI query aborted: CQC (Arena) detected" = "CAPI upit prekinut: detektovana CQC (Arena)"; + +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Nema podataka o komandantu"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Ko ste vi?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Gdje se nalazite?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "U čemu letite?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Frontier CAPI serverska greška"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +"CAPI: Refreshing access token..." = "CAPI: osvježavanje pristupnog tokena..."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Posljednji put osvježeno %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "pauza {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Zatvaranje programa..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Provjerite da li postoji nadograđena verzija ili obavijesite autora da treba da promijeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -214,31 +235,34 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB obrada journala je deaktivirana. Pogledajte Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Slanje podataka na EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje sa EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspjela (EDMC prestar?). Pogledajte log."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Statusni kod {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ +"No 'Route' array in NavRoute.json contents" = "Nema 'Route' polja u sadržaju NavRoute.json"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Odgodi slanje do pristajanja"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "EDDN obrada journala je deaktivirana. Pogledajte Log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ @@ -637,6 +661,12 @@ /* stats.py: Power rank; In files: stats.py:162; */ "Rating 5" = "Rating 5"; +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +"Status: Don't yet know your Commander name" = "Status: još uvijek nije poznato ime komandanta"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +"Status: No CAPI data yet" = "Status: još uvijek nema CAPI podataka"; + /* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ "Value" = "Vrijednost"; diff --git a/L10n/sr-Latn.strings b/L10n/sr-Latn.strings index 126b9dcf..6c52b323 100644 --- a/L10n/sr-Latn.strings +++ b/L10n/sr-Latn.strings @@ -13,178 +13,181 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Greška: Pogrešni kredencijali"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Greška"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Greška: Nemoguća provera tokena customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Greška: nemoguće dobaviti token"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:781; */ +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ "Frontier CAPI down for maintenance" = "Frontier CAPI isključen radi održavanja"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Greška pri Frontier CAPI upitu"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Osveži"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Uvek na vrhu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Nepoznato"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "Greška: Proverite lokaciju E:D žurnal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Brod"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Odelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Fajl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Izmeni"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Prozor"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Pomoć"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Proveri da li postoje izmene..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Polisa o privatnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Informacije o ovoj verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Podešavanja"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Izlaz"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Prijavljivanje..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autentifikacija uspešna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Niste pristali na stanicu!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Stanica nema ništa!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Stanica nema market!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:945; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ "CAPI query aborted: Cmdr name unknown" = "CAPI upit prekinut: Ime komandira nepoznato"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:951; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ "CAPI query aborted: Game mode unknown" = "CAPI upit prekinut: Režim igre nepoznat"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:957; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ "CAPI query aborted: Current system unknown" = "CAPI upit prekinut: Trenutni sistem nepoznat"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:963; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI upit prekinut: U multi-posadi drugog broda"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:969; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI upit prekinut: CQC (Arena) detektovana"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Nema podataka o komandiru"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Ko ste vi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Gde se nalazite?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "U čemu letite?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Greška na Frontier CAPI serveru"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +"CAPI: Refreshing access token..." = "CAPI: Osvežavanje pristupnog tokena..."; + +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Poslednji put osveženo %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "cooldown {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Gasim..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Proverite da li postoji nadograđena verzija ili obavesite autora da treba da promeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -232,31 +235,34 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "Obrada žurnala za EDDB je deaktivirana. Pogledajte Log."; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Slanje podataka na EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje na EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspela (EDMC prestar?). Pogledajte log."; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Vraćen {STATUS} statusni kod."; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ +"No 'Route' array in NavRoute.json contents" = "Nema 'Route' niza u NavRoute.json sadržaju"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Odloži slanje pre pristajanja"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "Obrada žurnala za EDDN je deaktivirana. Pogledajte Log."; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/sv-SE.strings b/L10n/sv-SE.strings index 272c5450..ffed23b9 100644 --- a/L10n/sv-SE.strings +++ b/L10n/sv-SE.strings @@ -7,145 +7,145 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Fel: ogiltligt användarnamn eller lösenord"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Fel: Fel användare. Har du flera konton eller en gammal API-nyckel från ett nollställt konto?"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Uppdatera"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Alltid överst"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Roll"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Skepp"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Fil"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Ändra"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "View"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Fönster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Hjälp"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Om {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Sök efter uppdateringar..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Lagra rådata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Integritetspolicy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Versionsinformation"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Inställningar"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Avsluta"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiera"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Loggar in..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Autentisering lyckad"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Du är inte dockad vid en station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "Stationen är tom!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "Stationen har ingen marknad!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Hämtar data..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Vem är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Vart är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "Okänt skepp? (felmeddelande)"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Senaste uppdatering: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "Vänta {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "En eller flera aktiverade plugins har inte stöd för Python 3.x. Var vänlig kontrollera listan med plugins under fliken '{PLUGINS}' under '{FILE}' > '{SETTINGS}'. Kontrollera om det finns en nyare version tillgänglig eller informera utvecklaren.\n\nDu kan också avaktivera din plugin genom att ändra slutet av namnet på mappen till '{DISABLED}'"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins utan stöd för Python 3.x"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Standard"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Skickar data till EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Fel: Kan inte ansluta till EDDN"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Skicka stationsdata till Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Skicka system och scan-data till Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Skicka bara uppdateringar till EDDN när du är dockad"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/uk.strings b/L10n/uk.strings index 1b4aa74e..a47da03f 100644 --- a/L10n/uk.strings +++ b/L10n/uk.strings @@ -7,151 +7,151 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Помилка: Невірні облікові дані!"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Помилка! Не той обліковий запис!"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Помилка"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "Помилка: Не вдалося перевірити токен customer_id"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "Error: customer_id не співпадає!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Помилка: не вдалося отримати токен"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "Оновлення"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "Поверх інших вікон"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "Невідомо"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Км-др"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "Посада"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "Корабель"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "Станція"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "Файл"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "Редагувати"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "Вид"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "Вікно"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "Довідка"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "Про {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "Перевірка оновлень..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "Зберегти необроблені дані..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "Статус"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "Політика конфіденційності"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "Інформація про реліз"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "Налаштування"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "Вихід"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "Документація"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "Копіювати"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "Вхід в..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "Автентифікацію пройдено успішно"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "Ви не стиковані з станцією!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "На станції немає нічого!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "На станції немає ринку!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "Отримання даних..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI: Не отримано данних пілота"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "Хто ти?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "Де ми?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "На чому летимо?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "Останнє оновлення було %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "Винищувач"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "Стрілець"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "Керівник"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "очікування {SS} сек"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "Згода"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "Закриття..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один або кілька увімкнених плагінів ще не підтримують Python 3.x. Перегляньте список на вкладці '{PLUGINS}' в '{FILE}' > '{SETTINGS}'. Ви повинні перевірити, чи є в наявності оновлена ​​версія, інакше повідомити розробника плагіну про те, що їм потрібно оновити код для Python 3.x.\n\nВи можете відключити плагін, перейменувавши його папку додавши '{DISABLED}' в кінці назви."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "Плагіни"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Плагіни без підтримки Python 3.x!"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -169,19 +169,19 @@ /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ "Default" = "Стандартне налаштування"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "Відправка даних до EDDN..."; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "Помилка: Немає зв'язку з EDDN!"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Надсилати дані станцій до Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "Відправляти систему і результати сканування в Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "Відкласти відправку даних до стикування"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ diff --git a/L10n/zh-Hans.strings b/L10n/zh-Hans.strings index 9d3765b8..c3bb4907 100644 --- a/L10n/zh-Hans.strings +++ b/L10n/zh-Hans.strings @@ -13,160 +13,160 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "错误:无效的登录凭证"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:281; */ +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "错误:指挥官不一致"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:405; companion.py:490; */ +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "错误"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:448; companion.py:453; */ +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ "Error: Couldn't check token customer_id" = "错误:无法检查 customer_id 令牌"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:459; */ +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ "Error: customer_id doesn't match!" = "错误:customer_id 不匹配!"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:481; */ +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "错误:无法获取令牌"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:793; */ +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "无法访问 Frontier CAPI"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:517; EDMarketConnector.py:812; EDMarketConnector.py:1504; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ "Update" = "更新"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:600; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ "Always on top" = "永远在最前"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:730; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ "Unknown" = "未知"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:799; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ "Error: Check E:D journal file location" = "错误:请检查 E:D 日志文件位置"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:806; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "指挥官"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:808; EDMarketConnector.py:1263; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ "Role" = "角色"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:808; EDMarketConnector.py:1273; EDMarketConnector.py:1296; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ "Ship" = "飞船"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:809; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ "Suit" = "套装"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:810; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:811; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ "Station" = "站点"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:814; EDMarketConnector.py:829; EDMarketConnector.py:832; EDMarketConnector.py:1991; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ "File" = "文件"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:815; EDMarketConnector.py:830; EDMarketConnector.py:833; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ "Edit" = "编辑"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:816; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ "View" = "显示"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:817; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ "Window" = "窗口"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:818; EDMarketConnector.py:831; EDMarketConnector.py:834; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ "Help" = "帮助"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:821; EDMarketConnector.py:847; EDMarketConnector.py:1550; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ "About {APP}" = "关于 {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:823; EDMarketConnector.py:846; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ "Check for Updates..." = "检查版本更新…"; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:824; EDMarketConnector.py:838; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ "Save Raw Data..." = "保存原始数据…"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:825; EDMarketConnector.py:837; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ "Status" = "状态"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:826; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ "Privacy Policy" = "隐私政策"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:827; EDMarketConnector.py:845; EDMarketConnector.py:1584; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ "Release Notes" = "更新说明"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:839; EDMarketConnector.py:1992; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ "Settings" = "设置"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:840; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ "Exit" = "退出"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:843; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ "Documentation" = "帮助文档"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:850; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ "Copy" = "复制"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:856; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ "Logging in..." = "登录中…"; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:872; EDMarketConnector.py:1415; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ "Authentication successful" = "身份验证成功"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:903; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ "You're not docked at a station!" = "你尚未靠站!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:911; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ "Station doesn't have anything!" = "此站点没有任何货物!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:916; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have a market!" = "此站点没有货物市场!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:990; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ "Fetching data..." = "取得数据…"; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1031; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ "CAPI: No commander data returned" = "CAPI:没有指挥官数据"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1035; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ "Who are you?!" = "你是谁?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1041; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ "Where are you?!" = "你在哪里?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1048; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ "What are you flying?!" = "你在飞什么?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ "Frontier CAPI server error" = "Frontier CAPI 服务器错误"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1210; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ "Last updated at %H:%M:%S" = "最后更新于 %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1238; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ "Fighter" = "舰载机驾驶员"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1239; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ "Gunner" = "炮手"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1240; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ "Helm" = "舵手"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1498; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ "cooldown {SS}s" = "距离下次更新还有 {SS} 秒"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1610; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ "OK" = "确定"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1677; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ "Shutting down..." = "应用关闭中…"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1980:1986; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "一项或多项你所启用的插件尚不支持 Python 3.x,详情请见 {FILE} > {SETTINGS} > {PLUGINS}。请检查上述插件是否有可用的更新,若没有,则应与插件的开发者就 Python 3.x 的支持问题取得联系。\n\n你也可以禁用某一项插件,只需在其文件夹名称的末尾添加 {DISABLED} 即可。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:1990; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ "Plugins" = "插件"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2001; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC:不支持 Python 3.x 的插件"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -214,31 +214,31 @@ /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ "EDDB Journal processing disabled. See Log." = "EDDB Journal Processing 已禁用。请查看诊断日志。"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:695; eddn.py:1428; */ +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ "Sending data to EDDN..." = "正在向 EDDN 发送数据…"; -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:312; eddn.py:1364; eddn.py:1399; eddn.py:1440; */ +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ "Error: Can't connect to EDDN" = "错误:无法连接到 EDDN"; -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:330; */ +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ "EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 错误:EDDN 禁止了此旧版本的 EDMC 应用。请更新应用。"; -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:336; */ +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ "EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 错误:数据有效性检查失败。可能是 EDMC 应用版本过旧,请查看诊断日志。"; -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:341; */ +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "EDDN 错误:返回错误代码 {STATUS}"; -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1111; */ +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "发送站点数据到 Elite Dangerous Data Network"; -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1122; */ +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ "Send system and scan data to the Elite Dangerous Data Network" = "发送星系和扫描数据到 Elite Dangerous Data Network"; -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1133; */ +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ "Delay sending until docked" = "延时更新,靠站时再发送"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1222; */ +/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ "EDDN journal handler disabled. See Log." = "EDDN Journal Handler 已禁用。请查看诊断日志。"; /* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ From 741b90c5288b95bc670478f42d9dd0a55a68ac55 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 13 Nov 2021 11:26:02 +0000 Subject: [PATCH 207/527] Set `develop` version back to 5.3.0-beta0 --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index b44edf4b..053eb0d7 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.2' +_static_appversion = '5.3.0-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 03657092af57ad8c0b4eda3a4521bb7f13188d39 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 13 Nov 2021 12:37:31 +0000 Subject: [PATCH 208/527] systray: Add LANG comment The original systray work seems to predate the LANG comments, and I didn't double-check there *was* one. --- prefs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/prefs.py b/prefs.py index b6cf4b10..d6728ab4 100644 --- a/prefs.py +++ b/prefs.py @@ -873,6 +873,7 @@ class PreferencesDialog(tk.Toplevel): if platform == 'win32': nb.Checkbutton( appearance_frame, + # LANG: Appearance option for Windows "minimize to system tray" text=_('Minimize to system tray'), variable=self.minimize_system_tray, command=self.themevarchanged From ba6902959354e5766ff6dcb8c649b08ddb2e1c48 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 13 Nov 2021 12:38:49 +0000 Subject: [PATCH 209/527] L10n: Re-generated now we have a LANG for "Minimize to systray" --- L10n/en.template | 203 ++++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 100 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index 9d48ba84..d520a556 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -34,160 +34,160 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI query failure"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Update"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Always on top"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Unknown"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Error: Check E:D journal file location"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Ship"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Suit"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "File"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Edit"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "View"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Window"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Help"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "About {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Check for Updates..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Save Raw Data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Privacy Policy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Release Notes"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Settings"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Exit"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Copy"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Logging in..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Authentication successful"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "You're not docked at a station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Station doesn't have anything!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Station doesn't have a market!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "CAPI query aborted: Cmdr name unknown"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "CAPI query aborted: Game mode unknown"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "CAPI query aborted: Current system unknown"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI query aborted: In other-ship multi-crew"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI query aborted: CQC (Arena) detected"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Fetching data..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: No commander data returned"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Who are you?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Where are you?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "What are you flying?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPI server error"; -/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ "CAPI: Refreshing access token..." = "CAPI: Refreshing access token..."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Last updated at %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "cooldown {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Shutting down..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -202,7 +202,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignore"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Default"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -277,7 +277,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "None"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -301,142 +301,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Error: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferences"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Please choose what data to save"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Market data in CSV format file"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Market data in Trade Dangerous format file"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Ship loadout"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automatically update on docking"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "File location"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Change..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Browse..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Output"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D journal file location"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Keyboard shortcut"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Re-start {APP} to use shortcuts"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} needs permission to use shortcuts"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Open System Preferences"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Only when Elite: Dangerous is the active app"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Play sound"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Disable Automatic Application Updates Check when in-game"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Preferred websites"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Shipyard"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Use alternate URL method"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Log Level"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Configuration"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Main UI privacy options"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Hide private group name in UI"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Hide multi-crew captain name"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privacy"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normal text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Highlighted text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Language"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Theme"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Dark"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparent"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "UI Scale Percentage"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 means Default{CR}Restart Required for{CR}changes to take effect!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Main window transparency"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 means fully opaque.{CR}Window is updated in real time"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Minimize to system tray"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Appearance"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Plugins folder"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Open"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Enabled Plugins"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Plugins Without Python 3.x Support:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Information on migrating plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Disabled Plugins"; /* stats.py: Cmdr stats; In files: stats.py:53; */ From 785f9a32350778d4364579fceb208a3cbd3935ce Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 16 Nov 2021 11:07:32 +0000 Subject: [PATCH 210/527] PLUGINS.md: We don't currently include all of Python stdlib --- PLUGINS.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/PLUGINS.md b/PLUGINS.md index cb0920e4..00072e18 100644 --- a/PLUGINS.md +++ b/PLUGINS.md @@ -1014,9 +1014,19 @@ well as the `__pycache__` directory. ## Packaging extra modules EDMarketConnector's Windows installs only package a minimal set of modules. -All of the 'stdlib' of Python is provided, plus any modules the core -application code uses and a small number of additional modules for the -use of plugins. See + +Any modules the core application code uses will naturally be packaged, and +we explicitly include a small number of additional modules for the use of +plugins. + +Whilst we would like to make all of the `stdlib` of Python available it is +not automatically packaged into our releases by py2exe. We hope to address +this in the 5.3 release series. In the meantime, if there's anything +missing that you'd like to use, please ask. Yes, this very much means you +need to test your plugins against a Windows installation of the application +to be sure it will work. + +See [Plugins:Available imports](https://github.com/EDCD/EDMarketConnector/blob/main/PLUGINS.md#available-imports) for a list. From 8909fc82492b4dc0e553baa439b4eb480046c85a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 16 Nov 2021 11:42:19 +0000 Subject: [PATCH 211/527] Python: Bump version to 3.9.9 Test build done locally, .exe showed no problems. --- .github/workflows/windows-build.yml | 2 +- .python-version | 2 +- ChangeLog.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 80965e54..bcd99454 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.4.0 - uses: actions/setup-python@v2.2.2 with: - python-version: "3.9.8" + python-version: "3.9.9" architecture: "x86" - name: Install python tools diff --git a/.python-version b/.python-version index 26cb4859..b04bfd83 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.8 +3.9.9 diff --git a/ChangeLog.md b/ChangeLog.md index 756bc562..2aafb817 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.9.8. +* We now test against, and package with, Python 3.9.9. **As a consequence of this we no longer support Windows 7. This is due to @@ -30,7 +30,7 @@ produce the Windows executables and installer. Developers --- -* Now built using Python 3.9.8. +* Now built using Python 3.9.9. Release 5.2.2 From 45437368b924b724d1ba6874b131a67d0d6f457f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 17:02:46 +0000 Subject: [PATCH 212/527] build(deps): bump actions/setup-python from 2.2.2 to 2.3.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.2.2 to 2.3.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.2.2...v2.3.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 5361f84e..f6a6d44b 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -53,7 +53,7 @@ jobs: # Get Python set up #################################################################### - name: Set up Python 3.9 - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.0 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 021b9109..94bbcbd3 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python 3.9 - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.0 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index bcd99454..5f394a24 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: "3.9.9" architecture: "x86" From f5a65dd666f6de51c2e9976df8bcd010a4291021 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 17:04:06 +0000 Subject: [PATCH 213/527] build(deps-dev): bump flake8-noqa from 1.2.0 to 1.2.1 Bumps [flake8-noqa](https://github.com/plinss/flake8-noqa) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/plinss/flake8-noqa/releases) - [Commits](https://github.com/plinss/flake8-noqa/compare/v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: flake8-noqa dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 2f687257..d3c22835 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ flake8-docstrings==1.6.0 isort==5.10.1 flake8-isort==4.1.1 flake8-json==21.7.0 -flake8-noqa==1.2.0 +flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 From 8363e8c6468535cf160c1ad1056f5d322091ba48 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 21 Nov 2021 11:24:18 +0000 Subject: [PATCH 214/527] monitor: Don't re-init Enginers/Rank/Reputation on LoadGame The order of Journal events changed from: 1. LoadGame 2. Rank 3. Progress to: 1. Rank 2. Progress 3. LoadGame in Odyssey, and in at least current 'base game' and Horizons clients as well. Also 'Reputation' event is before 'LoadGame' now. So simply allow those events to have populated the data, don't re-init on LoadGame. Yes, I'm preferring to leave the lines in, but commented, so it's clear why those aren't being init'd, *and* why 'Statistics' still is, and as of what game version. --- monitor.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/monitor.py b/monitor.py index 65119f7f..ac3f55e1 100644 --- a/monitor.py +++ b/monitor.py @@ -554,10 +554,12 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below 'Horizons': entry['Horizons'], # From 3.0 'Odyssey': entry.get('Odyssey', False), # From 4.0 Odyssey 'Loan': entry['Loan'], - 'Engineers': {}, - 'Rank': {}, - 'Reputation': {}, - 'Statistics': {}, + # For Odyssey, by 4.0.0.100, and at least from Horizons 3.8.0.201 the order of events changed + # to LoadGame being after some 'status' events. + # 'Engineers': {}, # 'EngineerProgress' event now before 'LoadGame' + # 'Rank': {}, # 'Rank'/'Progress' events now before 'LoadGame' + # 'Reputation': {}, # 'Reputation' event now before 'LoadGame' + 'Statistics': {}, # Still after 'LoadGame' in 4.0.0.903 'Role': None, 'Taxi': None, 'Dropship': None, From 4ee21325899ca802419730b351ea090f8ab63499 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 21 Nov 2021 11:33:44 +0000 Subject: [PATCH 215/527] Pre-Release 5.2.3-beta1: appversion & changelog --- ChangeLog.md | 19 +++++++++++++++++-- config.py | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 2aafb817..943593e1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,11 +27,28 @@ produce the Windows executables and installer. --- +Pre-Release 5.2.3-beta1 +=== + +This releases fixes one bug. + +* Odyssey changed the order of some Journal events. This caused our logic + for tracking the following to break, and thus not report them ever to Inara: + + - Ship Combat, Trade and Exploration ranks. + - On-foot Combat and Exobiologist ranks. + - Engineer unlocks and progress. + - Reputations with Major Factions (Superpowers). + + This is now fixed and the current state of all of these will be correctly + reported to Inara if you have API access for it configured. + Developers --- * Now built using Python 3.9.9. +--- Release 5.2.2 === @@ -71,8 +88,6 @@ Bug Fixex - For any EDDN message that receives a 400 status back we will drop it from the replay log. ---- - Release 5.2.1 === diff --git a/config.py b/config.py index 053eb0d7..65b8248e 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta0' +_static_appversion = '5.2.3-beta1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 9f231cc57eda254658c20b24098a68a768421563 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 21 Nov 2021 11:41:39 +0000 Subject: [PATCH 216/527] changelog: 5.2.3-beta1: releases -> release --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 943593e1..acfceb95 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -30,7 +30,7 @@ produce the Windows executables and installer. Pre-Release 5.2.3-beta1 === -This releases fixes one bug. +This release fixes one bug. * Odyssey changed the order of some Journal events. This caused our logic for tracking the following to break, and thus not report them ever to Inara: From 71ed90fb3a807da9499ee68bf279deb8dfdddc0f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 22 Nov 2021 10:42:31 +0000 Subject: [PATCH 217/527] Fix click_counter example to work & pass linting * It was returning 'ClickCounter' for the name, mis-matching with the folder name of 'click_counter', which caused plain logging to be used. That in turn then complained about the lack of %(osthreadid). * flake8 pass, including adding doc strings, with references to PLUGINS.md sections. * mypy pass. --- docs/examples/click_counter/load.py | 34 +++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/docs/examples/click_counter/load.py b/docs/examples/click_counter/load.py index ff9b449d..fd402866 100644 --- a/docs/examples/click_counter/load.py +++ b/docs/examples/click_counter/load.py @@ -8,10 +8,11 @@ import logging import tkinter as tk from typing import Optional -import myNotebook as nb +import myNotebook as nb # noqa: N813 from config import appname, config -PLUGIN_NAME = "ClickCounter" +# This **MUST** match the name of the folder the plugin is in. +PLUGIN_NAME = "click_counter" logger = logging.getLogger(f"{appname}.{PLUGIN_NAME}") @@ -76,7 +77,7 @@ class ClickCounter: :param cmdr: The current ED Commander :param is_beta: Whether or not EDMC is currently marked as in beta mode """ - config.set('click_counter_count', self.click_count.get()) + config.set('click_counter_count', self.click_count.get()) # type: ignore def setup_main_ui(self, parent: tk.Frame) -> tk.Frame: """ @@ -92,7 +93,7 @@ class ClickCounter: button = tk.Button( frame, text="Count me", - command=lambda: self.click_count.set(str(int(self.click_count.get()) + 1)) + command=lambda: self.click_count.set(str(int(self.click_count.get()) + 1)) # type: ignore ) button.grid(row=current_row) current_row += 1 @@ -107,20 +108,45 @@ cc = ClickCounter() # Note that all of these could be simply replaced with something like: # plugin_start3 = cc.on_load def plugin_start3(plugin_dir: str) -> str: + """ + Handle start up of the plugin. + + See PLUGINS.md#startup + """ return cc.on_load() def plugin_stop() -> None: + """ + Handle shutdown of the plugin. + + See PLUGINS.md#shutdown + """ return cc.on_unload() def plugin_prefs(parent: nb.Notebook, cmdr: str, is_beta: bool) -> Optional[tk.Frame]: + """ + Handle preferences tab for the plugin. + + See PLUGINS.md#configuration + """ return cc.setup_preferences(parent, cmdr, is_beta) def prefs_changed(cmdr: str, is_beta: bool) -> None: + """ + Handle any changed preferences for the plugin. + + See PLUGINS.md#configuration + """ return cc.on_preferences_closed(cmdr, is_beta) def plugin_app(parent: tk.Frame) -> Optional[tk.Frame]: + """ + Set up the UI of the plugin. + + See PLUGINS.md#display + """ return cc.setup_main_ui(parent) From fe55eb11f88a72d3a31d25dcf8137f135ba10bf9 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 22 Nov 2021 10:57:46 +0000 Subject: [PATCH 218/527] click_counter: Cast value to int() for saving --- docs/examples/click_counter/load.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/examples/click_counter/load.py b/docs/examples/click_counter/load.py index fd402866..776e9d4b 100644 --- a/docs/examples/click_counter/load.py +++ b/docs/examples/click_counter/load.py @@ -77,7 +77,9 @@ class ClickCounter: :param cmdr: The current ED Commander :param is_beta: Whether or not EDMC is currently marked as in beta mode """ - config.set('click_counter_count', self.click_count.get()) # type: ignore + # You need to cast to `int` here to store *as* an `int`, so that + # `config.get_int()` will work for re-loading the value. + config.set('click_counter_count', int(self.click_count.get())) # type: ignore def setup_main_ui(self, parent: tk.Frame) -> tk.Frame: """ From c3fd74b968688ef85d648a686ee0614dfcfc1c0d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 22 Nov 2021 11:06:57 +0000 Subject: [PATCH 219/527] Updated translations --- L10n/cs.strings | 183 ++++++++++++++++++------------------ L10n/de.strings | 203 ++++++++++++++++++++-------------------- L10n/es.strings | 185 ++++++++++++++++++------------------ L10n/fi.strings | 183 ++++++++++++++++++------------------ L10n/fr.strings | 158 +++++++++++++++---------------- L10n/hu.strings | 148 ++++++++++++++--------------- L10n/it.strings | 183 ++++++++++++++++++------------------ L10n/ja.strings | 203 ++++++++++++++++++++-------------------- L10n/ko.strings | 201 +++++++++++++++++++-------------------- L10n/lv.strings | 144 ++++++++++++++-------------- L10n/nl.strings | 158 +++++++++++++++---------------- L10n/pl.strings | 203 ++++++++++++++++++++-------------------- L10n/pt-BR.strings | 201 +++++++++++++++++++-------------------- L10n/pt-PT.strings | 201 +++++++++++++++++++-------------------- L10n/ru.strings | 203 ++++++++++++++++++++-------------------- L10n/sl.strings | 118 +++++++++++------------ L10n/sr-Latn-BA.strings | 203 ++++++++++++++++++++-------------------- L10n/sr-Latn.strings | 203 ++++++++++++++++++++-------------------- L10n/sv-SE.strings | 154 +++++++++++++++--------------- L10n/uk.strings | 181 +++++++++++++++++------------------ L10n/zh-Hans.strings | 191 ++++++++++++++++++------------------- 21 files changed, 1926 insertions(+), 1881 deletions(-) diff --git a/L10n/cs.strings b/L10n/cs.strings index 50d11fc0..f7f6988f 100644 --- a/L10n/cs.strings +++ b/L10n/cs.strings @@ -28,139 +28,139 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Dotaz na Frontier CAPI selhal"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Aktualizovat"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Vždy navrchu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Neznámý"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Loď"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Oblek"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Systém"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Stanice"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Soubor"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Upravit"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Zobrazit"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Nápověda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Zkontrolovat aktualizace..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Uložit surová data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Zásady ochrany osobních údajů"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Poznámky k verzi"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Nastavení"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Ukončit"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentace"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopírovat"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Přihlašování..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Přihlášení bylo úspěšné"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Nejste zadokováni ve stanici!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Stanice nenabízí žádné služby!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Stanice nemá obchod!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Načítání dat..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Nebyla vrácena žádná data komandéra"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Kdo jste?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Kde zrovna jste?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "S jakou lodí létáte?"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Chyba Frontier CAPI serveru"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Poslední aktualizace %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Počkej ještě {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Vypínání..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jeden nebo více aktivních pluginů ještě stále nepodporuje Python 3.x. Podívejte se na jejich seznam v záložce '{PLUGINS}' v '{FILE}' > '{SETTINGS}'. Zkontrolujte si jestli není dostupná novější verze pluginu, pokud ne, tak kontaktujte vývojáře pluginu o tom, že musí upravit jejich plugin pro Python 3.x.\n\nPlugin můžete vypnout přidáním '{DISABLED}' na konec názvu jeho složky."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy, které nepodporují Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -175,7 +175,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorovat"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Výchozí"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -238,7 +238,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API klíč"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Žádná"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -262,133 +262,136 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Chyba: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Nastavení"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Vyberte, která data chcete ukládat"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Obchodní data ve formátu CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Obchodní data ve formátu Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Konfigurace lodi"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automaticky aktualizovat při zadokování"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Cesta k souboru"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Změnit..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Procházet..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Výstup"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D umístění souboru deníku"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Klávesová zkratka"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Klávesová zkratka"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Restartujte {APP} pro aktivaci klávesových zkratek"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} vyžaduje oprávnění pro použití klávesových zkratek"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Otevřít Předvolby systému"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Pouze pokud je Elite: Dangerous aktivní"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Přehrát zvuk"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Vypnout automatickou kontrolu aktualizací aplikace, pokud jste ve hře"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Preferované stránky"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Shipyard"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Použít alternativní URL metodu"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Míra logování"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Nastavení"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Soukromí"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normální text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Zvýrazněný text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Jazyk"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Schéma"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Tmavé"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Průhledné"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Procenta UI škálování"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 je výchozí hodnota{CR}je potřeba restartovat,{CR}aby se změna projevila!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Průhlednost hlavního okna"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 znamená plně neprůhledné.{CR}Okno se aktualizuje v reálném čase"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Minimalizovat do lišty"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Vzhled"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Složka pluginů"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Otevřít"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: Plugin můžete vypnout přidáním{CR}'{EXT}' do názvu jeho složky"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Zapnuté pluginy"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Pluginy bez podpory Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informace jak migrovat pluginy."; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Vypnuté pluginy"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/de.strings b/L10n/de.strings index 6f7d00de..3ce8c6ce 100644 --- a/L10n/de.strings +++ b/L10n/de.strings @@ -34,160 +34,160 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI Anfrage gescheitert"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Aktualisieren"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Immer im Vordergrund"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Unbekannt"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Fehler: Prüfe E:D Journal Dateispeicherort"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Kdt."; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rolle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Schiff"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Anzug"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Datei"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Bearbeiten"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Ansicht"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Fenster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Hilfe"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Über {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Auf Aktualisierungen überprüfen..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Speichere Originaldaten..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Datenschutzrichtlinie"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Anmerkungen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Einstellungen"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Beenden"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopieren"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Anmelden..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Authentifizierung erfolgreich"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Du bist an keiner Station angedockt!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Diese Station hat nichts!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Diese Station hat keinen Markt!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "CAPI Anfrage abgebrochen: Kdt. Name unbekannt"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "CAPI Anfrage abgebrochen: Spielmodus unbekannt"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "CAPI Anfrage abgebrochen: Aktuelles System unbekannt"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI Anfrage abgebrochen: In anderem Schiff in Multicrew"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI Anfrage abgebrochen: CQC (Arena) erkannt"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Daten werden abgerufen..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Keine Kommandanten-Daten erhalten"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Wer bist du?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Wo bist du?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Was fliegst du?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPI Server-Fehler"; -/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ "CAPI: Refreshing access token..." = "CAPI: Erneuere Access-Token..."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Zuletzt aktualisiert um %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Kanonier"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Steuer"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Wartezeit {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Programm schließt..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Eins oder mehr deiner aktivierten Plugins hat noch keinen Support für Python 3.x. Du kannst dir die Liste im '{PLUGINS}'-Tab unter '{FILE}' > '{SETTINGS}' ansehen. Du solltest prüfen, ob es für diese Updates gibt und ansonsten dem Entwickler Bescheid geben, dass sie ihren Code für Python 3.x aktualisieren müssen.\n\nDu kannst ein Plugin deaktivieren, indem du dessen Ordner ein '{DISABLED}' am Ende des Namens anhängst."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins ohne Python 3.x Support"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -202,7 +202,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorieren"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standard"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -277,7 +277,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Schlüssel"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Keine Zuweisung"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -301,142 +301,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Fehler: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Einstellungen"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Bitte wähle zu speichernde Daten aus"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Marktdaten als CSV Datei"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Marktdaten als Trade-Dangerous Datei"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Schiffsausstattung"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automatisch beim Andocken aktualisieren"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Speicherort"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Ordner..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Durchsuchen..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Ausgabe"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D Journal Dateispeicherort"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Makro"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Starte {APP} neu, um den Tastenkürzel nutzen zu können"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} benötigt für Tastenkürzel Systemrechte (Bedienungshilfen)"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Öffne Systemeinstellungen"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Nur wenn Elite: Dangerous geöffnet ist"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Ton abspielen"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Während das Spiel läuft nicht auf Updates überprüfen"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Favorisierte Webseiten"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Werft"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Alternative URL-Methode benutzen"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Log-Level"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfiguration"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Haupt-UI-Datenschutzoptionen"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Private Gruppe-Name im UI verstecken"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Multi-Crew Kapitänsnamen verstecken"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Datenschutz"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normaler Text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Hervorgehobener Text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Sprache"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Theme"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Dunkel"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparent"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "UI-Skalierung in Prozent"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 bedeutet Standardwert{CR}Neustart erforderlich, um{CR}Änderungen zu übernehmen!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Durchsichtigkeit Hauptfenster"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 bedeutet komplett undurchsichtig.{CR}Fenster wird in Echtzeit aktualisiert"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "In die Taskleiste minimieren"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Aussehen"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Plugin-Ordner"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Öffnen"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tipp: Du kannst ein Plugin deaktivieren, indem{CR}du '{EXT}' zu seinem Ordnernamen hinzufügst"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Aktivierte Plugins"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Plugins ohne Python 3.x Support"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informationen zum Migrieren von Plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Deaktivierte Plugins"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/es.strings b/L10n/es.strings index cfa72d90..5cbefc4c 100644 --- a/L10n/es.strings +++ b/L10n/es.strings @@ -31,142 +31,142 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Fallo de consulta del CAPI de Frontier"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Actualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Siempre visible"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Desconocido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Error: Comprueba la localización del fichero journal de E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Estación"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Archivo"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Visualización"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Ventana"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Ayuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Acerca de {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Buscar Actualizaciones..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Guardar Datos Sin Procesar..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Estado"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Política de Privacidad"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notas de la versión"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Configuración"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Salir"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentación"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Identificándose..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autenticación correcta"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "¡No estás atracado en una estación!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "¡La estación no tiene nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "¡La estación no tiene mercado!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Recopilando datos..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: No se devolvió datos de comandante"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "¿Quién eres?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "¿Dónde estás?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "¿Qué estás volando?"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Error de servidor CAPI de Frontier"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Última actualización: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Caza"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Artillero"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Timón"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Espere {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Aceptar"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Apagando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o más de tus plugins habilitados aún no tienen soporte para Python 3.x. Por favor, consulta la lista en la pestaña '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Deberías comprobar si hay una versión actualizada disponible, si no, avisa al desarrollador de que necesita actualizar el código para Python 3.x.\n\nPuedes deshabilitar un plugin cambiando el nombre de su carpeta para que tenga '{DISABLED}' al final del nombre."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Sin Soporte para Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -181,7 +181,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorar"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Por defecto"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -253,7 +253,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Llave API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ninguna"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -277,133 +277,136 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Error: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferencias"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Seleccione qué datos quiere guardar"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Datos de mercado en formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Datos de mercado en formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Equipamiento de la Nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Actualizar automáticamente al atracar"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Localización de archivos"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Cambiar..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Examinar..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Salida"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Localización del archivo de Journal de E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Tecla de acceso directo"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Tecla de acceso directo"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Reinicie {APP} para usar los accesos directos de teclado"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} necesita permisos para usar teclas de acceso directo"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Abrir Preferencias del Sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Solo cuando Elite: Dangerous es la aplicación activa"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Reproducir sonido"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Desactivar Comprobación Automática de Actualizaciones de la Aplicación mientras juega"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Sitios Web preferidos"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Astillero"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Usar método URL alternativo"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Nivel de registro"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Configuración"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privacidad"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Texto normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Texto resaltado"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Idioma"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Oscuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Porcentaje escala UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Por Defecto{CR}Se requiere reiniciar{CR}para que los cambios surtan efecto!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Transparencia de la ventana principal"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 significa completamente opaco.{CR}La ventana se actualiza en tiempo real."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Minimizar a la bandeja de sistema"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Apariencia"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Carpeta de Plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Abrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Puedes desactivar un plugin añadiendo{CR}'{EXT}' al nombre de su carpeta"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Plugins Activados"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Plugins sin soporte para Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Información sobre migración de plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins Desactivados"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/fi.strings b/L10n/fi.strings index bb11ba43..3ebe807e 100644 --- a/L10n/fi.strings +++ b/L10n/fi.strings @@ -28,139 +28,139 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI kyselyvirhe."; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Päivitä"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Aina päällimmäisenä"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Tuntematon"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rooli"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Alus"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Asuste"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Järjestelmä"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Asema"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Tiedosto"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Muokkaa"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Näytä"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Ikkuna"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Apua"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Ohjelmasta {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Tarkista päivitykset..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Tallenna raakadata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Tila"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Tietosuojakäytäntö"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Julkaisutiedot"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Valinnat"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Lopeta"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentaatio"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopioi"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Kirjaudutaan..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Todennus onnistui"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Et ole telakoituneena asemalle!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Asemalla ei ole mitään!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Asemalla ei ole kaupankäyntiä!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Noudetaan tietoja..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: tietoja ei löytynyt"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Kuka olet?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Missä olet?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Mitä alusta lennät?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPI palvelinvirhe."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Päivitetty viimeksi %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Hävittäjä"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Aseiden käyttäjä"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Pilotti"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Jäähtymisaika {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Sulkeutuu..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Yksi tai useampi käyttämistäsi lisäosista ei sisällä vielä Pyhton 3.x -tukea. Tarkista tiedoston '{FILE}' > '{SETTINGS}' välilehti '{PLUGINS}' lisäosista, onko niistä uudempaa versiota saatavilla; muussa tapauksessa ota yhteyttä sen kehittäjään ja kerro, että sen lähdekoodi on päivitettävä Python 3.x -tasolle.\n\nVoit estää lisäosan toiminnan nimeämällä sen hakemiston siten, että se päättyy tekstiin '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Lisäosat"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Lisäosat ilman Python 3.x -tukea"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -175,7 +175,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Älä huomioi"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Oletus"; /* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ @@ -211,7 +211,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API avain"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ei määritelty"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -235,133 +235,136 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Inaran virhe: {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Valinnat"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Valitse mitkä tiedot tallennetaan"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Markkinadata CSV -formaatissa"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Markkinadata Trade Dangerous -formaatissa"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Aluksen konfiguraatio"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Päivitä automaattisesti telakoituessa"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Tiedostosijainti"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Muuta..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Selaa..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Tallennus"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D lokikirjan tiedostosijainti"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Näppäimistöoikopolku"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Pikanäppäin"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Käynnistä {APP} uudelleen käyttääksesi pikanäppäimiä"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} tarvitsee lupasi pikakuvakkeiden käyttämiseen"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Avaa järjestelmän asetukset"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Vain jos Elite:Dangerous on käynnissä"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Toista ääni"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Estä automaattiset päivitystarkastukset pelaamisen aikana"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Ensisijaiset sivustot"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Telakka"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Käytä vaihtoehtoista URL-metodia"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Lokin syvyys"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Valinnat"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Yksityisyys"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normaali teksti"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Korostettu teksti"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Kieli"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Teema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Tumma"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Läpinäkyvä"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Käyttöliittymän skaalausprosentti"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 tarkoittaa oletusta{CR}Muutosten käyttöönotto{CR}edellyttää uudelleenkäynnistystä!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Pääikkunan läpinäkyvyys"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 tarkoittaa täysin peittävää.{CR}Ikkuna päivittyy reaaliajassa."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Pienennä tehtäväpalkkiin"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Ulkoasu"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Lisäosien hakemistosijainti"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Avaa"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Vihje: Voit poistaa lisäosan käytöstä{CR}lisäämällä '{EXT}' sen hakemistonimeen"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Käytössä olevat liitännäiset"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Lisäosat, joissa ei ole Python 3.x -tukea:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Tietoja lisäosien siirrosta"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Estetyt liitännäiset"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/fr.strings b/L10n/fr.strings index ae736fd9..54f7c480 100644 --- a/L10n/fr.strings +++ b/L10n/fr.strings @@ -10,130 +10,130 @@ /* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Erreur : Cmdr incorrect"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Mettre à jour"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Toujours visible"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmd"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rôle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Vaisseau"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Combinaison"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Système"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Fichier"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Édition"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Présentation"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Fenêtre"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Aide"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "À propos de {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Chercher une mise à jour..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Sauvegarder les Données Brutes..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "État"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Politique de Confidentialité"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notes de publication"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Paramètres"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Quitter"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Copier"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Connexion en cours..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Authentification réussie"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Vous n'êtes pas amarré à une station !"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "La station n'a rien du tout !"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "La station n'a pas de marché !"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Récupération des données..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Qui êtes-vous ?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Où êtes-vous ?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Avec quoi volez-vous ?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Dernière mise à jour à %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Chasseur"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Artilleur"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Pilote"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Temps de recharge {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Un ou plusieurs de vos plugins activés ne sont pas encore compatibles avec Python 3.x. Regardez la liste sur l'onglet '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Vous devriez vérifier s'il y a une version mise à jour, sinon alertez le développeur qu'il doit mettre à jour le code pour Python 3.x.\n\nVous pouvez désactiver un plugin en renommant son dossier pour qu'il ait '{DISABLED}' à la fin du nom."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins non compatibles avec Python 3.x"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Par défaut"; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ @@ -163,7 +163,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Clé API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Aucun"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -181,112 +181,112 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Erreur : Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Préférences"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Veuillez choisir les données à sauvegarder"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Données du marché au format CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Données du marché au format Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Équipements du vaisseau"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Mettre à jour automatiquement à l'amarrage"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Emplacement des fichiers"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Spécifier..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Parcourir..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Sorties"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Emplacement du journal E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Raccourci clavier"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Raccourci clavier"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Rédémarrez {APP} pour utiliser les raccourcis"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} a besoin de permissions pour utiliser les raccourcis"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Ouvrir Préférences Système"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Seulement quand Elite: Dangerous est l'application active"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Jouer un son"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Désactiver la vérification automatique des mises à jour quand vous êtes en jeu"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Sites préférés"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Chantier naval"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Configuration"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Confidentialité"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Texte normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Texte en surbrillance"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Langue"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Thème"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Foncé"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparent"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Apparence"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Répertoire des plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Ouvrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Astuce : Vous pouvez désactiver un plugin en{CR}ajoutant '{EXT}' à son nom de répertoire"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Plugins activés"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informations sur la migration des plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins désactivés"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/hu.strings b/L10n/hu.strings index a7ae12cb..ba1fd156 100644 --- a/L10n/hu.strings +++ b/L10n/hu.strings @@ -10,121 +10,121 @@ /* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Hiba:Rossz parancsnok"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Frissítés"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Mindig felül"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Parancsnok"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Szerep"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Hajó"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Rendszer"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Állomás"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Fájl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Szerkeszt"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Nézet"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Ablak"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Segítség"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Az {APP} névjegye"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Frissítések keresése"; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Nyers adat elmentése"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Státusz"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Adatvédelmi irányelvek"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Kiadási megjegyzések"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Beállítások"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Kilépés"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentáció"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Másol"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Bejelentkezés"; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "A hitelesítés sikerült"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = " Nem dokkoltál az állomáson"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Az állomáson nincs semmi!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Nincs piac az állomáson!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Adatok lekérése"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Ki vagy?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Hol vagy?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Mivel repülsz?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Utoljára frissítve %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Vadászgép"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Lövész"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Kormányos"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Lehűl {SS} másodperc"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Ok"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Pluginok"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Alap"; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ @@ -154,7 +154,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API kulcs"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Egyik sem"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -172,106 +172,106 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Hiba:Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Beállítások"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Kérem válassza ki a menteni kivánt adatokat."; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Piaci adat CSV fájlban"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Piaci adat Trade Dangerous fájlban"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Hajó felszerelése"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automatikusan frissit dokkolásnál"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Fálj helye"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Módosítás..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Böngész"; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Kimenet"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D journal fájl helye"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Billentyűparancsok"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Gyorsgomb"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Újranidítás {APP} parancsikonok használatával"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} engedély szükséges a parancsikon használatához"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Rendszerbeállítások megnyitáss"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Csak ha az Elite Dangerous fut"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Zene be"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Preferált weboldalak"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Hajógyár"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfiguráció"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Titkosítás"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normál txt"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Kiemelt szöveg"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Nyelv"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Téma"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Sötét"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Átlárható"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Megjelenés"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Plugin mappa"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Nyisd ki"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tipp:a pluginokat kikapcsolhatod hozzà{CR}adsz a mappa nevében egy '{EXT}'"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Pluginok engedélyezése"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugin kikapcsolása"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/it.strings b/L10n/it.strings index c3e8fe7d..2ecde8cf 100644 --- a/L10n/it.strings +++ b/L10n/it.strings @@ -13,139 +13,139 @@ /* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ "Error" = "Errore"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Recupera"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Sempre in primo piano"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Sconosciuto"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Ruolo"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Tuta"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Stazione"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "File"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Appunti"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Vista"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Finestra"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Guida"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Informazioni su {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Controlla aggiornamenti..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Salva i Dati Grezzi..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Informativa sulla privacy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Note di rilascio"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Impostazioni"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Esci"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentazione"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Copia"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Mi sto loggando..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autenticazione riuscita"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Non sei parcheggiato in nessuna stazione !"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "La Stazione non ha niente !"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "La Stazione non ha un Market !"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Sto raccogliendo i dati..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Nessun dato sul commandante"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Chi sei ?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Dove sei finito ?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Stai volando ?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Errore nel server Frontier CAPI"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Ultimo aggiornamento alle %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Cacciatore"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Artigliere"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Timoniere"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "disponibile tra {SS} secondi"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Spegnimento..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o più dei tuoi plugin non ha ancora il supporto per Python 3.x. Per favore guarda la lista '{PLUGINS}' nella tab a '{FILE}' > '{SETTINGS}'. Dovresti controllare se ci sono aggiornamenti, altrimenti avvisa gli sviluppatori che devono aggiornare il codice a Python 3.x.\n\nPuoi disabilitare il plugin rinominando la cartella aggiungendo '{DISABLED}' alla fine del nome."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins senza Supporto Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -160,7 +160,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignora"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Predefinito"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -214,7 +214,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nessuna"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -235,133 +235,136 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Errore: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferenze"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Si prega di scegliere che dati salvare"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Market data in formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Market data in formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Equipaggiamento della nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Auto-aggiornamento all'ormeggio"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Percorso del file"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Cambia..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Sfoglia..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Output"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "locazione del file E:D journal"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Scorciatoia di tastiera"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Riavvia {APP} per usare le scorciatoie"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} ha bisogno dei permessi per usare le scorciatoie"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Apri Preferenze di Sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Solo quando “Elite: Dangerous” è in primo piano"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Notifica sonora"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Disabilita gli aggiornamenti automatici quando sei in-game"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Sito web preferito"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Spazioporto"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Usare metodo URL alternativo"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Livello di Log"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Configurazione"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Dati personali"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Testo normale"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Testo evidenziato"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Lingua"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Scuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Trasparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Percentuale zoom della UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Default{CR}Riavvio Richiesto per{CR}applicare i cambiamenti!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Trasparenza della finestra principale"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 stà per completamente opaco.{CR}Finestra è aggiornata in tempo reale"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Riduci a icona nel Vassoio di sistema"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Aspetto"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Cartella dei plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Apri"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Suggerimento: è possibile disabilitare un plugin {CR}aggiungendo '{EXT}' nel nome della sua cartella"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Plugin abilitati"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Plugin senza il supporto a Python 3.x :"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informazioni sulla migrazione dei plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugin disabilitati"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/ja.strings b/L10n/ja.strings index 02e4aed2..d7f1d0af 100644 --- a/L10n/ja.strings +++ b/L10n/ja.strings @@ -34,160 +34,160 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPIクエリ失敗"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "更新"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "常に最前面に表示する"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "不明"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "エラー: E:Dジャーナルファイルの場所を確認してください"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "コマンダー"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "役割"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "船"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "スーツ"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "ステーション"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "ファイル"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "編集"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "表示"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "ウィンドウ"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "ヘルプ"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "{APP} について"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "更新の確認..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "生データの保存..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "ステータス"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "プライバシーポリシー"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "リリースノート"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "設定"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "終了"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "ドキュメント"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "コピー"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "ログイン中..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "認証成功"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "ステーションにドッキングしていません!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "このステーションには何も商品がありません!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "このステーションには市場がありません!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "CAPIクエリ中止: CMDR名が不明"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "CAPIクエリ中止: ゲームモードが不明"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "CAPIクエリ中止: 現システムが不明"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "CAPIクエリ中止: 他の船でマルチクルー中"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "CAPIクエリ中止: CQC(Arena)が検出"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "データを取得中..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: コマンダーのデータが返ってきませんでした"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "どなたですか?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "どこにいますか?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "どの船で飛行していますか?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPIサーバエラー"; -/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ "CAPI: Refreshing access token..." = "CAPI: アクセストークンを更新中..."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "最終更新時間 %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "次回更新まであと {SS}秒"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "了解"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "終了します..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "有効にしている1つ以上のプラグインがPython 3.xをサポートしていません。'{FILE}' > '{SETTINGS}'\nメニューで表示される設定ダイアログの'{PLUGINS}' タブの一覧を確認してください。更新済みのバージョンがあるかを確認し、なければ開発者にPython 3.xに対応するように開発者に連絡してください。\n\nプラグインを無効にするにはフォルダ名の最後に'{DISABLED}'を追加してください。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "プラグイン"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: プラグインがPython 3.xをサポートしていません"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -202,7 +202,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "無視"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "デフォルト"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -277,7 +277,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "APIキー"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "設定なし"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -301,142 +301,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "エラー: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "環境設定"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "保存するデータの種類を選択して下さい"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "市場データをCSV形式で記録する"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "市場データをTrade Dangerous形式で記録する"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "船の装備構成"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "ドッキングした際に自動でデータを更新する"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "ファイルの出力先"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "変更..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "参照..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "出力"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:Dゲームクライアントのジャーナルファイル出力先"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "ショートカット"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "ホットキー"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "ショートカットを利用するには {APP} を再起動してください"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} がショートカットを利用するには許可が必要です"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "システム環境設定を開く"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Elite: Dangerousがアクティブの時だけ有効"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "音を鳴らす"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "ゲーム中の自動アプリケーション更新チェックを無効にする"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "お気に入りのウェブサイト"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "造船所"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "別のURL方式を使用する"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "ログレベル"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "環境設定"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "メインUIプライバシーオプション"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "UIでプライベートグループ名を表示しない"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "マルチクルー船長名を表示しない"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "プライバシー"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "通常表示"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "強調表示"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "言語"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "テーマ"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "ダーク"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "透明"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "UIスケール比率"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100はデフォルトを意味します{CR}変更した値を反映するには{CR}再起動が必要です!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "メインウィンドウの透明度"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100は完全に不透明であることを意味します。{CR}ウィンドウはリアルタイムで更新されます"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "システムトレイに最小化する"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "表示"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "プラグインフォルダ"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "開く"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "ヒント: プラグインを無効にするには{CR}フォルダ名に '{EXT}' を追加してください"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "有効なプラグイン"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Python 3.xサポートのないプラグイン:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "プラグインの移行に関する情報"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "無効なプラグイン"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/ko.strings b/L10n/ko.strings index 73a249be..7767dc4a 100644 --- a/L10n/ko.strings +++ b/L10n/ko.strings @@ -34,157 +34,157 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI 쿼리 실패"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "새로 고침"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "항상 위에 보이기"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "알 수 없음"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "오류: E:D 저널 파일의 위치를 확인하십시오"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "커맨더"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "함선"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "슈트"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "성계"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "스테이션"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "파일"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "편집"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "보기"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "창"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "도움말"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "{APP} 정보"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "업데이트 확인하기..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Raw 데이터 저장하기..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "상태"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "개인정보처리방침"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "릴리즈 노트"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "설정"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "종료"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "문서 자료"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "복사"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "로그인하는 중..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "인증 성공"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "스테이션에 도킹되어 있지 않습니다!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "스테이션에 아무것도 없습니다!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "스테이션에 마켓이 없습니다!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "CAPI 쿼리 중단: 커맨더 이름 알 수 없음"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "CAPI 쿼리 중단: 게임 모드 알 수 없음"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "CAPI 쿼리 중단: 현재 성계 알 수 없음"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI 쿼리 중단: 다른 함선의 멀티크루로 참여중"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI 쿼리 중단: CQC(아레나) 감지됨"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "데이터 가져오는 중..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: 커맨더 정보가 반환되지 않음"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "당신은 누구시죠?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "어디 계신거죠?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "지금 어떤 함선을 몰고 계신 건가요?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPI 서버 오류"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "마지막 업데이트: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "쿨다운 {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "종료하는 중..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "활성화된 플러그인 중 1개 이상이 Python 3.x를 지원하지 않습니다. '{FILE}' > '{SETTINGS}' 에서 '{PLUGINS}' 탭에 들어가 활성화되어있는 플러그인 목록을 확인하십시오. 플러그인들 중 새 버전이 나온 것이 있는지도 확인해보시고, 만약 3.x를 지원하지도, 새 버전도 없다면 해당 플러그인의 개발자에게 코드를 수정하기를 문의하십시오.\n\n플러그인을 비활성화하려면 '{DISABLED}'를 폴더명 뒤에 추가하면 됩니다."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "플러그인"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Python 3.x을 지원하지 않는 플러그인"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -199,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "무시하기"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "기본값"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -271,7 +271,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API 키"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "없음"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -295,142 +295,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "오류: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "설정"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "어느 데이터를 저장할 지 선택해주세요"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "CSV 형식 파일의 마켓 정보"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Trade Dangerous 형식 파일의 마켓 정보"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "함선 피팅"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "도킹시 자동으로 서버에 정보 업데이트하기"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "파일 위치"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "바꾸기..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "찾아보기..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "출력"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D 저널(journal) 파일 위치"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "단축키 설정"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "단축키"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "단축키를 사용하려면 {APP}을(를) 다시 시작하십시오"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "단축기 사용을 위해선 {APP}이 권한 허용을 필요로 합니다"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "시스템 설정 열기"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Elite: Dangerous가 활성 창 상태일때만"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "소리 재생하기"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "게임이 실행중일 때 프로그램 업데이트 확인하지 않기"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "선호하는 사이트"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "쉽야드"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "다른 URL 형식 사용하기"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "로깅 수준"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "환경 설정"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "메인 UI 개인정보 설정"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "UI에서 프라이빗 그룹 이름 숨기가"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "멀티크루 함장 이름 숨기기"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "개인정보"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "일반 텍스트"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "강조된 텍스트"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "언어"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "테마"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "어둡게"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "투명하게"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "UI 스케일 백분율"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100은 '기본 설정'을 의미하며{CR}변경사항 적용을 위해{CR}재시작이 요구됩니다!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "메인 창 투명도"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100은 완전히 불투명함을 의미합니다.{CR}창은 실시간으로 업데이트됨"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "시스템 트레이로 최소화"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "스타일"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "플러그인 폴더"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "열기"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "팁: 플러그인을 비활성화하려면{CR} '{EXT}'를 폴더명 뒤에 추가하면 됨"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "활성 플러그인"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Python 3.x을 지원하지 않는 플러그인:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "플러그인 위치 변경에 대한 정보"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "비활성 플러그인"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/lv.strings b/L10n/lv.strings index cb0dbe91..e5b53fa3 100644 --- a/L10n/lv.strings +++ b/L10n/lv.strings @@ -7,121 +7,121 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Kļūda: Nederīga lietotāja informācija"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Atjaunināt"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Vienmēr virspusē"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Loma"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Kuģis"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistēma"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Stacija"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Fails"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Labot"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Skats"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Logs"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Palīdzība"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Par {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Pārbaudīt atjauninājumus..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Saglabāt sākotnējos datus..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Statuss"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Privātuma politika"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informācija par laidienu"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Iestatījumi"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Iziet"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentācija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopēt"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Autorizējas..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autentifikācija sekmīga"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Jūs neesat stacijā!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Stacijā nekā nav!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Stacijā nav tirgus!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Iegūst datus..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Kas tu esi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Kur tu esi?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Ar ko tu lido?"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Pēdējo reizi atjaunināts %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Cīnītājs"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Ložmetējnieks"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Stūre"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Atskaite {SS}"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Labi"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Spraudņi"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Noklusējuma"; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ @@ -148,7 +148,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API atslēga"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Neviens"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -157,100 +157,100 @@ /* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Kļūda: Nevar savienoties ar EDSM"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Iestatījumi"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Lūdzu izvēlaties kādus datus saglabāt"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Tirgus dati CSV formātā"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Tirgus dati Trade Dangerous formātā"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Kuģa loadout"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automtiski atjaunoties nosēžoties."; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Faila atrašanās vieta"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Mainīt..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Pārlūkot..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Izvade"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D žurnāla faila atrašanās vieta"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Ātrais taustiņš"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Ātrais taustiņš"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Restartējiet {APP} lai izmantotu īssceļus"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} vajag atļaujas lai izmantotu īssceļus"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Atvērt sistēmas iestatījumus"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Tikai kad Elite: Dangerous ir aktīvā aplikācija"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Atskaņot skaņu"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Kuģu būvētava"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfigurācija"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privātums"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normālais teksts"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Izceltais teksts"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Valoda"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Dizains"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Tumša"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Caurspīdīga"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Izskats"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Spraudņu mape"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Atvērt"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Iespējoti Spraudņi"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Atspējoti Spraudņi"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/nl.strings b/L10n/nl.strings index 9e14e600..1a5e1985 100644 --- a/L10n/nl.strings +++ b/L10n/nl.strings @@ -10,127 +10,127 @@ /* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Fout: Verkeerde Cmdr"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Bijwerken"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Altijd op voorgrond"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Schip"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Systeem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Bestand"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Bewerken"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Beeld"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Venster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Help"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Over {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Controleren op updates..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Sla onbewerkte gegevens op..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Privacybeleid"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Release opmerkingen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Instellingen"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Afsluiten"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentatie"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopieëren"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Bezig met inloggen..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Authenticatie voltooid"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Je bent niet gedockt in een station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Station heeft helemaal niets!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Station heeft geen markt!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Data wordt opgehaald..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Wie ben je?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Waar ben je?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Waar vlieg je in?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Voor het laatst bijgewerkt om %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Gevechtsvlieger"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Schutter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Stuurman"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "wachtperiode {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Een of meer ingeschakelde plugins hebben nog geen Python 3.x ondersteuning. Kijk op de lijst op de '{PLUGINS}' tab van '{FILE}' > '{SETTINGS}'. Check of er een bijgewerkte versie beschikbaar is. Laat anders de developer weten dat ze de code moeten updaten voor Python 3.x.\n\nJe kan de plugin uitschakelen door het mapje te hernoemen met '{DISABLED}' aan het eind van de naam."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMS: Plugins zonder Python 3.x ondersteuning"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standaard"; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ @@ -160,7 +160,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Geen"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -178,115 +178,115 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Fout: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferences"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Welke gegevens wilt u opslaan?"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Markt data in CSV bestand formaat"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Markt data in Trade Dangerous bestand formaat"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Schip inrichting"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automatisch bijwerken na de landing"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Bestand locatie"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Wijzigen..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Bladeren..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Uitvoer"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D journaal bestand locatie"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Toetscombinaties"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Hotkey"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "{APP} heropstarten om toetscombinaties te gebruiken"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} heeft toestemming nodig om toetscombinaties te gebruiken"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Open Systeemvoorkeuren"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Alleen wanneer Elite: Dangerous de actieve applicatie is"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Geluid afspelen"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Schakel Automatische update check uit wanneer in-game"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Voorkeur websites"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Scheepswerf"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Gebruik andere URL methode"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Configuratie"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privacy"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normale tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Gemarkeerde tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Taal"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Thema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Donker"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparent"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Vormgeving"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Plugins map"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Openen"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: Je kan een plugin deactiveren door '{EXT}'{CR}toe te voegen aan de map naam"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Geactiveerde plugins"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informatie over plugins migreren"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Gedeactiveerde plugins"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/pl.strings b/L10n/pl.strings index c9af3ee2..4ac1d33b 100644 --- a/L10n/pl.strings +++ b/L10n/pl.strings @@ -34,160 +34,160 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Błąd zapytania CAPI Frontier"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Aktualizacja"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Zawsze na wierzchu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Nieznany"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Błąd: Sprawdź lokalizację pliku dziennika E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rola"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Statek"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Kombinezon"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Stacja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Plik"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Edycja"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Widok"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Pomoc"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "{APP}..."; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Sprawdź aktualizacje..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Zapisz Nieprzetworzone Dane..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Polityka prywatności"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informacje o wersji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Ustawienia"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Zakończ"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacja"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiuj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Logowanie..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autoryzacja pomyślna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Nie jesteś zadokowany do stacji!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Stacja jest pusta!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "W stacji nie ma giełdy towarowej!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "Zapytanie CAPI anulowane: nazwa komandora nieznana"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "Zapytanie CAPI anulowane: tryb gry nieznany"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "Zapytanie CAPI anulowane: obecny system nieznany"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "Zapytanie CAPI anulowane: jako załogant w innym statku"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "Zapytanie CAPI anulowane: wykryto arenę CQC"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Pobieranie danych..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Nie zwrócono danych dowódcy"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Kim jesteś?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Gdzie jesteś?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Czym latasz?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Błąd serwera CAPI Frontier"; -/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ "CAPI: Refreshing access token..." = "CAPI: Odświeżanie tokena dostępu..."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Ostatnia aktualizacja %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Oczekiwanie {SS} sek."; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Wyłączanie..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Co najmniej jeden z uruchomionych pluginów nie wspiera Python 3.x. Sprawdź listę w '{FILE}' > '{SETTINGS}', sekcja '{PLUGINS}'. Upewnij się, że dostępna jest aktualna wersja pluginu, w przeciwnym razie poinformuj twórcę, że należy zaktualizować kod do wersji Python 3.x.\n\nMożesz wyłączyć plugin, dodając '{DISABLED}' na koniec nazwy jego folderu."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy Nie Wspierające Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -202,7 +202,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Zignoruj"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Domyślne"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -274,7 +274,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Klucz API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Brak"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -298,142 +298,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Błąd: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferencje"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Jakie dane zapisywać"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Dane rynkowe w formacie CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Dane rynkowe w formacie Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Wyposażenie statku"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Aktualizuj automatycznie po zadokowaniu"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Położenie pliku"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Zmień..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Przeglądaj..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Wyjście"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D Lokacja pliku dziennika"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Skrót klawiaturowy"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Skr. Klaw."; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Zrestartuj {APP} by użyć{CR}skrótu klawiszowego."; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} wymaga uprawnień by{CR}móc korzystać ze skrótów klawiszowych."; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Otwórz Preferencje systemowe"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Tylko gdy Elite: Dangerous jest aplikacją aktywną"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Odtwórz dźwięk"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Wyłącz automatyczne wyszukiwanie aktualizacji, gdy jesteś w grze"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Preferowane strony"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Stocznia"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Użyj alternatywnej metody URL"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Poziom logowania"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfiguracja"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Opcje prywatności UI"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Ukruj nazwę grupy prywatnej w UI"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Ukryj nazwę kapitana w \"multi-crew\""; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Prywatność"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Zwykły tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Podświetlony tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Język"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Schemat kolorystyczny"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Ciemny"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Przezroczyste"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Skalowanie UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 oznacza wartość domyślną{CR}Zmiany zostaną wprowadzone po{CR}ponownym uruchomieniu programu!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Przeźroczystość okna głównego"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 oznacza nieprzeźroczyste.{CR}Okno aktualizowane w czasie rzeczywistym."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Zminimalizuj do zasobnika systemowego"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Wygląd"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Folder pluginów"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Otwórz"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Wskazówka: Możesz wyłączyć pluginy{CR}dodając '{EXT}' do nazwy folderu"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Włączone pluginy"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Pluginy nie obsługiwane przez Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informacja o migracji pluginów"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Pluginy wyłączone"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/pt-BR.strings b/L10n/pt-BR.strings index 35a200b6..f8e21e54 100644 --- a/L10n/pt-BR.strings +++ b/L10n/pt-BR.strings @@ -34,157 +34,157 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Falha na requisição ao CAPI da Frontier"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Atualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Sempre no topo"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Desconhecido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Erro: Verifique a localicação dos arquivos de Jornais E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Arquivo"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Visualizar"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Janela"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Ajuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Sobre {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Verificar por Atualizações..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Salvar dados brutos..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Política de Privacidade"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notas de atualização"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Configurações"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Sair"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Efetuando login..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autenticação bem-sucedida"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Você não está docado na estação!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "A estação não tem nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "A estação não tem um mercado!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "Requisição CAPI cancelada: nome de CMDT desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "Requisição CAPI cancelada: modo de jogo desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "Requisição CAPI cancelada: sistema atual desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "Requisição CAPI cancelada: em multi-crew em outra nave"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "Requisição CAPI cancelada: CQC (Arena) detectado"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Nenhum dado de comandante retornado"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Quem é você?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Onde está você?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "No que você está voando?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Erro de servidor do CAPI da Frontier"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Última atualização %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Caça"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Artilheiro"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Comando"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "aguarde {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Encerrando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins habilitados não possuem suporte ao Python 3.x. Você pode ver a lista na guia '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Você deve verificar se existe versão atualizada ou então avisar o desenvolvedor de que ele precisa atualizar o código para o Python 3.x.\n\nVocê pode desabilitar um plugin renomeando sua pasta para que seu nome termine com '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem Suporte ao Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -199,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorar"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Padrão"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -271,7 +271,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Chave da API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nenhum"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -295,142 +295,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Erro: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferências"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Por favor, escolha quais dados para salvar"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Dados de mercado no arquivo de formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Dados de mercado no arquivo de formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Modulação da nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Atualizar automaticamente na docagem"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Localização do Arquivo"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Alterar..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Procurar..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Saída"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Localização dos arquivos de Jornais E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Atalho de teclado"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Tecla de atalho"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Reinicie o {APP} para usar os atalhos"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} precisa de permissão para usar atalhos"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Abrir preferências do sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Somente quando o Elite: Dangerous é o aplicativo ativo"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Tocar som"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Desativar Verificação Automática de Atualizações do EDMC enquanto jogo"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Website preferido"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Estaleiro"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Usar URL alternativa"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Nível de Log"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Configuração"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Opções de privacidade da IU"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Ocultar nome do grupo privado na IU"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Ocultar nome do capitão em multi-crew."; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privacidade"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Texto normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Texto destacado"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Idioma"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Escuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Porcentagem de escala da IU"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Padrão{CR}Necessário Reiniciar para as{CR}alterações entrarem em vigor!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Transparência da janela principal"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 significa totalmente opaco.{CR}A janela é atualizada em tempo real."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Minimizar para a área de notificação"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Aparência"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Pasta dos plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Abrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Dica: Você pode desativar um plugin{CR}adicionando '{EXT}' ao nome da pasta"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Plugins Habilitados"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Plugins sem suporte a Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informações de migração de plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins desabilitados"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/pt-PT.strings b/L10n/pt-PT.strings index 0cc84896..c8ce1eec 100644 --- a/L10n/pt-PT.strings +++ b/L10n/pt-PT.strings @@ -34,157 +34,157 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Falha ao consultar a CAPI da Frontier."; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Actualizar"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Sempre por cima"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Desconhecido"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Erro: Verifique a localização do ficheiro do diário E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdt"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Nave"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Fato"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Ficheiro"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Editar"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Ver"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Janela"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Ajuda"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Sobre {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Procurar por Actualizações..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Salvar dados em bruto..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Estado"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Política de Privacidade"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notas da Versão"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Definições"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Sair"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Copiar"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Realizando login..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autenticação bem-sucedida"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Não está atracado numa Estação"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "A Estação não tem nada!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "A Estação não possui um mercado!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "Consulta à CAPI abortada: Nome do Comandante desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "Consulta à CAPI abortada: Modo de Jogo desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "Consulta à CAPI abortada: Sistema actual desconhecido"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "Consulta à CAPI abortada: Jogador em multi-tripulação noutra nave."; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "Consulta à CAPI abortada: CQC (Arena) detectada."; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Dados do Comandante não recebidos"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Quem é você?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Onde é que está?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "No que é que está a voar?"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Erro do servidor CAPI da Frontier."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Última actualização: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Caça"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Artilheiro"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Comando"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "aguarde {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "A Desligar..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins activados não possui ainda suporte para Python 3.x. Por favor verifique a lista na aba '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Deverá verificar se está disponível uma versão mais actualizada, caso contrário, informe o desenvolvedor de que necessita de actualizar o código para suportar Python 3.x.\n\nPode desactivar um plugin colocando '{DISABLED}' no fim do nome da pasta correspondente."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem suporte para Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -199,7 +199,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignorar"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Predefinido"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -271,7 +271,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Chave API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nenhum"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -295,142 +295,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Erro: Inara: {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferências"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Por favor escolher quais os dados a guardar"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Ficheiro dos dados de Mercado no formato CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Ficheiro dos dados de Mercado no formato Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Módulos da nave"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Actualizar automaticamente ao atracar"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Localização do Ficheiro"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Alterar..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Procurar..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Saída"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Localização do ficheiro do diário E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Atalho de Teclado"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Tecla Rápida"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Reinicie o {APP} para usar os atalhos"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "A {APP} precisa de autorização para usar atalhos"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Abrir Preferências do Sistema"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Apenas quando o Elite:Dangerous é a aplicação activa"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Reproduzir som"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Desactivar Verificação de Updates Automáticos da Aplicação enquanto joga"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Websites preferidos"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Estaleiro"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Usar método URL alternativo."; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Nível de Log"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Configuração"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Opções Privacidade UI principal"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Esconder nome do grupo privado na UI"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Esconder nome de capitão em multi-tripulação."; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privacidade"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Texto normal"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Texto destacado"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Linguagem"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Escuro"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparente"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Percentagem da escala de UI"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 significa Predefinido{CR}Requer reinício para{CR}que as mudanças façam efeito!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Transparência da janela principal"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 é completamente opaco.{CR}A janela é actualizada em tempo real."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Minimizar para a barra de tarefas"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Aparência"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Pasta dos Plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Abrir"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Dica: Pode desactivar um plugin{CR}ao adicionar '{EXT}' ao nome da sua pasta"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Plugins Activados"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Plugins sem suporte para Python 3.x"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informação para migração de plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins Desactivados"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/ru.strings b/L10n/ru.strings index 127a315d..48feec49 100644 --- a/L10n/ru.strings +++ b/L10n/ru.strings @@ -34,160 +34,160 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Неудача при запросе к Frontier CAPI"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Обновить данные"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Поверх остальных окон"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Неизвестно"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Ошибка: проверьте расположение журналов E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "КМДР"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Роль"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Корабль"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Станция"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Файл"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Правка"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Вид"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Окно"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Дополнительно"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "О программе {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Проверить наличие обновлений..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Сохранить \"сырые\" данные.."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Статус"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Политика конфиденциальности"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Заметки о текущем релизе"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Настройки"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Выход"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Информация о плагине"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Копировать"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Идет подключение..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Аутентификация успешно завершена"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Ваш корабль не пристыкован к станции!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "На текущей станции никакие услуги не предоставляются!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "На текущей станции рынок недоступен!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "Запрос CAPI прерван: Имя командира неизвестно"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "Запрос CAPI прерван: Игровой режим неизвестен"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "Запрос CAPI прерван: Текущая система неизвестна"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "Запрос CAPI прерван: В мультиэкипаже другого корабля"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "Запрос CAPI прерван: Обнаружен CQC (Арена)"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Получение данных..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Нет данных пилота"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Невозможно определить личность командира!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Невозможно определить местоположение!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Невозможно определить тип корабля!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Серверная ошибка Frontier CAPI"; -/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ "CAPI: Refreshing access token..." = "CAPI: Обновление access токена"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Последнее обновление в %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Истребитель"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Стрелок"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Командир корабля"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "пауза {SS} сек"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Выключение..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один или несколько ваших подключённых плагинов ещё не имеют поддержки Python 3.x. Пожалуйста, ознакомьтесь со списком во вкладке '{PLUGINS}' '{FILE}' > '{SETTINGS}'. Вы должны проверить наличие обновлённой версии, в противном случае предупредите разработчика о необходимости обновления кода на Python 3.x.\n\nВы можете отключить плагин, переименовав его папку в '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Плагины"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Без поддержки Python 3.x"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -202,7 +202,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Игнорировать"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "По умолчанию"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -277,7 +277,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "Ключ API"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Не назначено"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -301,142 +301,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Ошибка: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Настройки"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Выберите какие данные стоит сохранять"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Данные рынков в формате CSV"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Данные рынков в формате Trade Dangerous"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Оборудование корабля"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Автоматически обновлять данные при стыковке"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Путь хранения файлов"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Обзор..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Просмотреть..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Данные"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Расположение файла журнала E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Сочетание клавиш"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Горячая клавиша"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Перезапустите {APP}, чтобы использовать сочетание клавиш"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} требуется разрешение на использование глобальных сочетаний клавиш"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Открыты «Настройки системы»"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Только когда окно Elite: Dangerous активно"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Звуковое оповещение"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Отключить автоматическое обновление приложения во время нахождения в игре"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Предпочитаемые сайты"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Верфи"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Альтернативный URL (адрес)"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Уровень лога"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Конфигурация"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Настройки приватности главного окна"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Скрывать название приватной группы в главном окне"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Скрывать ник капитана мультикрю сессии в главном окне"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Конфиденциальность"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Обычный текст"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Выделенный текст"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Язык"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Тема оформления"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Тёмная"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Прозрачная"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Процент масштабирования интерфейса"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 - значение по умолчанию{CR}требуется перезапуск для вступления в силу изменений{CR}!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Прозрачность главного окна"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 означает полностью непрозрачный.{CR}Окно обновляется в режиме реального времени."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Сворачивать в системный трей"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Внешний вид"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Папка плагинов"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Открыть"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Подсказка: Отключить конкретный плагин можно {CR} добавив '{EXT}' к названию папки"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Включённые плагины"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Плагины без поддержки Python 3.x"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Информация о мигрирующих плагинах"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Отключенные плагины"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/sl.strings b/L10n/sl.strings index 0b37f62c..0ea4162e 100644 --- a/L10n/sl.strings +++ b/L10n/sl.strings @@ -4,109 +4,109 @@ /* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ "Error: Invalid Credentials" = "Napaka: napačno uporabniški ime ali geslo"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Osveži"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Vedno na vrhu"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Vloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Ladja"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Postaja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Datoteka"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Uredi"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Okno"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Pomoč"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Preveri posodobitve..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Shrani Izvirne Podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Pravilnik o zasebnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Opombe ob izdaji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Nastavitve"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Izhod"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Prijava v teku... "; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Preverjanje pristnosti je bilo uspešno"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Nahajš se v postaji!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Postaja nima ničesar"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Postaja nima trga"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Nalagam podatke..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Kdo si"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Kje se nahajaš"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "S čim letiš"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Zadnja osvežitev podatkov %H:%M:%S "; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Posodobitev v {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Potrdi"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Privzeta"; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ @@ -127,7 +127,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API ključ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Brez"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -136,73 +136,73 @@ /* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ "Error: Can't connect to EDSM" = "Napaka: Povezava z EDSM ni mogoča"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Nastavitve"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Izberite podatke, ki jih želite shraniti"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Podatki trga v CSV formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Podatki trga v Trade Dangerous formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Oprema ladje"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Lokacija datoteke"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Spremeni..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Prebrskaj..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Izpis"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Bližnjica"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Bližnjica"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Ponovno poženi {APP} za uporabo bližnjic"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} potrebuje dovoljenja za uporabo bližnjic"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Odpri sistemske nastavitve"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Samo ko je Elite:Dangerous aktivna aplikacija "; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Sproži zvok"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfiguracija"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privatno"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Jezik"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Temno"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Prosojno"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Videz"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/sr-Latn-BA.strings b/L10n/sr-Latn-BA.strings index 17f7c40d..8c52ff58 100644 --- a/L10n/sr-Latn-BA.strings +++ b/L10n/sr-Latn-BA.strings @@ -34,160 +34,160 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Frontier CAPI neuspješan upit"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Osvježi"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Uvijek na vrhu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Nepoznato"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Greška: Provjerite lokaciju E:D journal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Brod"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Odijelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Fajl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Uredi"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Prozor"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Pomoć"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Provjeri nadogradnje..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Politika privatnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informacije o verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Podešavanja"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Izlaz"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Prijavljivanje..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autentifikacija uspješna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Niste pristali na stanicu"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Stanica nema ništa!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Stanica nema market!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "CAPI upit prekinut: nepoznato ime komandanta"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "CAPI upit prekinut: nepoznat režim igre"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "CAPI upit prekinut: nepoznat trenutni sistem"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI upit prekinut: u višečlanoj posadi drugog broda"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI upit prekinut: detektovana CQC (Arena)"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Nema podataka o komandantu"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Ko ste vi?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Gdje se nalazite?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "U čemu letite?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPI serverska greška"; -/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ "CAPI: Refreshing access token..." = "CAPI: osvježavanje pristupnog tokena..."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Posljednji put osvježeno %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "pauza {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Zatvaranje programa..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Provjerite da li postoji nadograđena verzija ili obavijesite autora da treba da promijeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -202,7 +202,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignoriši"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standardna"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -277,7 +277,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API ključ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Nije definisano"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -301,142 +301,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Greška: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Podešavanja"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Izaberite koji podaci se snimaju"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Fajl sa market podacima u CSV formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Fajl sa market podacima u Trade Dangerous formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Brodska oprema"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automatsko slanje nakon pristajanja"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Lokacija fajlova"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Promijeni..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Potraži..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Izvoz"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Lokacija E:D journal fajlova"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Prečica"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Prečica"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Restartujte {APP} da bi ste koristili prečice"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} traži dozvolu da koristi prečice"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Otvori sistemska podešavanja"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Samo kada je Elite: Dangerous aktivna aplikacija"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Zvučni efekat"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Isključi automatsku provjeru nadogradnji za vrijeme igranja"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Preferirani web sajtovi"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Brodogradilište"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Koristi alternativni URL metod"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Log nivo"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfiguracija"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Podešavanja privatnosti glavnog prozora"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Ne prikazuj naziv privatne grupe"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Ne prikazuj ime kapetana u višečlanoj posadi"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privatnost"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normalan tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Označeni tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Jezik"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Tamna"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Prozirna"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Procenat UI skaliranja"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 je standardna vrijednost{CR}Potreban je restart{CR}za primjenu podešavanja!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Prozirnost glavnog prozora"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 znači potpuno neprozirno.{CR}Prozor se osvježava u realnom vremenu"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Minimiziranje u system tray"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Izgled"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Folder za dodatke (plugins)"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Otvori"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Savjet: Možete da deaktivirate dodatak (plugin){CR}dodavanjem '{EXT}' na ime njegovog foldera"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Aktivirani dodaci (plugins)"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Dodaci (plugins) bez Python 3.x podrške:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informacije o migraciji dodataka (plugins)"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Deaktivirani dodaci (plugins)"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/sr-Latn.strings b/L10n/sr-Latn.strings index 6c52b323..1dfee4cb 100644 --- a/L10n/sr-Latn.strings +++ b/L10n/sr-Latn.strings @@ -34,160 +34,160 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "Greška pri Frontier CAPI upitu"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Osveži"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Uvek na vrhu"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Nepoznato"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Greška: Proverite lokaciju E:D žurnal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Brod"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Odelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Fajl"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Izmeni"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Pogled"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Prozor"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Pomoć"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "O {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Proveri da li postoje izmene..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Polisa o privatnosti"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informacije o ovoj verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Podešavanja"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Izlaz"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiraj"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Prijavljivanje..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autentifikacija uspešna"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Niste pristali na stanicu!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Stanica nema ništa!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Stanica nema market!"; -/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:956; */ +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ "CAPI query aborted: Cmdr name unknown" = "CAPI upit prekinut: Ime komandira nepoznato"; -/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:962; */ +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ "CAPI query aborted: Game mode unknown" = "CAPI upit prekinut: Režim igre nepoznat"; -/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:968; */ +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ "CAPI query aborted: Current system unknown" = "CAPI upit prekinut: Trenutni sistem nepoznat"; -/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:974; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ "CAPI query aborted: In other-ship multi-crew" = "CAPI upit prekinut: U multi-posadi drugog broda"; -/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:980; */ +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ "CAPI query aborted: CQC (Arena) detected" = "CAPI upit prekinut: CQC (Arena) detektovana"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Nema podataka o komandiru"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Ko ste vi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Gde se nalazite?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "U čemu letite?"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Greška na Frontier CAPI serveru"; -/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1177; */ +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ "CAPI: Refreshing access token..." = "CAPI: Osvežavanje pristupnog tokena..."; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Poslednji put osveženo %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "cooldown {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Gasim..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Proverite da li postoji nadograđena verzija ili obavesite autora da treba da promeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -202,7 +202,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ignoriši"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Podrazumevano"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -277,7 +277,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Ključ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ništa"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -301,142 +301,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Greška: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Podešavanja"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Izaberite koji se podaci snimaju"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Fajl sa market podacima u CSV formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Fajl sa market podacima u Trade Dangerous formatu"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Oprema na brodu"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automatsko slanje prilikom pristajanja"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Lokacija fajlova"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Izmeni..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Potraži..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Izlaz"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Lokacija E:D Journal fajlova"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Skraćenica"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Skraćenica"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Restartujte {APP} da bi ste koristili skraćenice"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} traži dozvolu da koristi skraćenice"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Otvori sistemska podešavanja"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Samo kada je Elite: Dangerous aktivna aplikacija"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Zvučni efekat"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Isključi automatsko proveravanje izmena aplikacije za vreme igranja"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Željeni web sajtovi"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Shipyard"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Koristi alternativni URL metod"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Log Nivo"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfiguracija"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "Podešavanja privatnosti za osnovni pogled"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "Ukloni ime privatne grupe iz osnovnog pogleda"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "Ukloni ime kapetana iz višečlane posade"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Privatnost"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normalan tekst"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Označeni tekst"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Jezik"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Tamno"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparentno"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Procenat UI skaliranja"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 znači podrazumevano{CR}Restart je potreban{CR}da bi se promene primenile!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Prozirnost glavnog prozora"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 znači potpuno neprozirno.{CR}Prozor se osvežava u realnom vremenu."; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Minimizuj u sistemsku paletu (SysTray)"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Izgled"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Folder za dodatke (plugins)"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Otvori"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: Možete deaktivirati dodatak (plugin) dodavanjem{CR}'{EXT}' na ime njegovog foldera"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Aktivirani dodaci (plugins)"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Pluginovi bez podrške za Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Informacije o migraciji dodataka (plugins)"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Deaktivirani dodaci (plugins)"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/sv-SE.strings b/L10n/sv-SE.strings index ffed23b9..4a93f01c 100644 --- a/L10n/sv-SE.strings +++ b/L10n/sv-SE.strings @@ -10,127 +10,127 @@ /* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ "Error: Wrong Cmdr" = "Fel: Fel användare. Har du flera konton eller en gammal API-nyckel från ett nollställt konto?"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Uppdatera"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Alltid överst"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Cmdr"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Roll"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Skepp"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Fil"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Ändra"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "View"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Fönster"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Hjälp"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Om {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Sök efter uppdateringar..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Lagra rådata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Status"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Integritetspolicy"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Versionsinformation"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Inställningar"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Avsluta"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Kopiera"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Loggar in..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Autentisering lyckad"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Du är inte dockad vid en station!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "Stationen är tom!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "Stationen har ingen marknad!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Hämtar data..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Vem är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Vart är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "Okänt skepp? (felmeddelande)"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Senaste uppdatering: %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Fighter"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Gunner"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Helm"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "Vänta {SS}s"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "En eller flera aktiverade plugins har inte stöd för Python 3.x. Var vänlig kontrollera listan med plugins under fliken '{PLUGINS}' under '{FILE}' > '{SETTINGS}'. Kontrollera om det finns en nyare version tillgänglig eller informera utvecklaren.\n\nDu kan också avaktivera din plugin genom att ändra slutet av namnet på mappen till '{DISABLED}'"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins utan stöd för Python 3.x"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standard"; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ @@ -160,7 +160,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Nyckel"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Ingen"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -178,109 +178,109 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Fel: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Inställningar"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Välj vilket data som skall lagras"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Marknadsdata i CSV-formaterad fil"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Marknadsdata i Trade Dangerous-formaterad fil"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Översikt av skepp"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Automatisk uppdatering vid dockning"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Filsökväg"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Ändra..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Bläddra..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Exportdata"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D journal-fil sökväg"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Genväg, tangentbord"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Snabbkommando"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Starta om {APP} för att använda genvägar"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} behöver rättigheter för att använda genvägar"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Öppna systeminställningar"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Bara när: Elite Dangerous är det aktiva programmet"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Spela ljud"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Leta inte efter programuppdateringar när spelet körs"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Föredragna webbsidor"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Översikt av skepp"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Konfiguration"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Normal text"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Markerad text"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Språk"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Tema"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Mörk"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Transparent"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Utseende"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Mapp för plugins"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Öppna"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tips: du kan avaktivera en plugin genom{CR}att lägga till '{EXT}' på slutet av mappens namn"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Aktiverade plugins"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Information om migrering av plugins"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Avaktiverade plugins"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/uk.strings b/L10n/uk.strings index a47da03f..48a1da17 100644 --- a/L10n/uk.strings +++ b/L10n/uk.strings @@ -22,136 +22,136 @@ /* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ "Error: unable to get token" = "Помилка: не вдалося отримати токен"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Оновлення"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Поверх інших вікон"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Невідомо"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "Км-др"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Посада"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "Корабель"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "Станція"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "Файл"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "Редагувати"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "Вид"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "Вікно"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "Довідка"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "Про {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "Перевірка оновлень..."; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Зберегти необроблені дані..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "Статус"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "Політика конфіденційності"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Інформація про реліз"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "Налаштування"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "Вихід"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Документація"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "Копіювати"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Вхід в..."; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "Автентифікацію пройдено успішно"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "Ви не стиковані з станцією!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "На станції немає нічого!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "На станції немає ринку!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Отримання даних..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI: Не отримано данних пілота"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "Хто ти?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "Де ми?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "На чому летимо?!"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Останнє оновлення було %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "Винищувач"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "Стрілець"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "Керівник"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "очікування {SS} сек"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Згода"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Закриття..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один або кілька увімкнених плагінів ще не підтримують Python 3.x. Перегляньте список на вкладці '{PLUGINS}' в '{FILE}' > '{SETTINGS}'. Ви повинні перевірити, чи є в наявності оновлена ​​версія, інакше повідомити розробника плагіну про те, що їм потрібно оновити код для Python 3.x.\n\nВи можете відключити плагін, перейменувавши його папку додавши '{DISABLED}' в кінці назви."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "Плагіни"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Плагіни без підтримки Python 3.x!"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -166,7 +166,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "Ігнорувати"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Стандартне налаштування"; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ @@ -196,7 +196,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Ключ"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "Нічого"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ @@ -214,133 +214,136 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "Помилка: Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Уподобання"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "Оберіть дані які буде збережено"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "Ринкові дані у форматі CSV файлу"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "Ринкові дані у форматі Trade Dangerous файлу"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "Технічні дані корабля"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "Автоматичне оновлювання при стикуванні зі станцією"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "Розташування файлу"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "Внесення змін..."; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "Перегляд..."; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "Вивід"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "Розташування файлу-журналу E:D"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "Сполучення клавіш"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "Гаряча клавіша"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "Перезавантажте {APP} для використання ярликів"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} необхідні дозволи для використання ярликів"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "Відкрити налаштування системи"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "Тільки тоді, коли Elite: Dangerous є активним додатком"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "Грати звук"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "Вимкнути автоматичні перевірки оновлення додатку, коли в грі"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "Обрані веб-сайти"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "Корабельна верф"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "Використовувати альтернативний URL-метод"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "Рівень подробиць журналу"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "Конфігурація"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "Конфіденційність"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "Нормальний текст"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "Виділений текст"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "Мова"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "Тема"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "Темний"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "Прозора"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "Відсоток шкали інтерфейсу користувача"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 означає, що {CR} потрібно перезапустити за замовчуванням, щоб зміни вступили в силу {CR}!"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "Прозорість головного вікна"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 означає повністю непрозоре. {CR} Вікно буде оновлюватись в режимі реального часу"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "Згорнути програму"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Зовнішній вигляд"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "Сховище плагінів"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "Відкрити"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Підказка: Ви можете відключити плагін через {CR} додання '{EXT}' до назви папки"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "Увімкнені плагіни"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "Плагіни без підтримки Python 3.x:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "Інформація про міграцію плагінів"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Вимкнені плагіни"; /* stats.py: Cmdr stats; In files: stats.py:53; */ diff --git a/L10n/zh-Hans.strings b/L10n/zh-Hans.strings index c3bb4907..f00c5f64 100644 --- a/L10n/zh-Hans.strings +++ b/L10n/zh-Hans.strings @@ -31,142 +31,142 @@ /* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ "Frontier CAPI query failure" = "无法访问 Frontier CAPI"; -/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:528; EDMarketConnector.py:823; EDMarketConnector.py:1515; */ +/* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "更新"; -/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:611; prefs.py:866; */ +/* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "永远在最前"; -/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:741; */ +/* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "未知"; -/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:810; */ +/* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "错误:请检查 E:D 日志文件位置"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:817; edsm.py:257; stats.py:52; theme.py:227; */ +/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ "Cmdr" = "指挥官"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:819; EDMarketConnector.py:1274; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "角色"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:819; EDMarketConnector.py:1284; EDMarketConnector.py:1307; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ "Ship" = "飞船"; -/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:820; */ +/* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "套装"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:821; prefs.py:606; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:822; prefs.py:624; prefs.py:761; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ "Station" = "站点"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:825; EDMarketConnector.py:840; EDMarketConnector.py:843; EDMarketConnector.py:2002; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ "File" = "文件"; -/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:826; EDMarketConnector.py:841; EDMarketConnector.py:844; */ +/* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ "Edit" = "编辑"; -/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:827; */ +/* EDMarketConnector.py: 'View' menu title on OSX; In files: EDMarketConnector.py:832; */ "View" = "显示"; -/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:828; */ +/* EDMarketConnector.py: 'Window' menu title on OSX; In files: EDMarketConnector.py:833; */ "Window" = "窗口"; -/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:829; EDMarketConnector.py:842; EDMarketConnector.py:845; */ +/* EDMarketConnector.py: Help' menu title on OSX; EDMarketConnector.py: 'Help' menu title; In files: EDMarketConnector.py:834; EDMarketConnector.py:847; EDMarketConnector.py:850; */ "Help" = "帮助"; -/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:832; EDMarketConnector.py:858; EDMarketConnector.py:1561; */ +/* EDMarketConnector.py: App menu entry on OSX; EDMarketConnector.py: Help > About App; In files: EDMarketConnector.py:837; EDMarketConnector.py:863; EDMarketConnector.py:1566; */ "About {APP}" = "关于 {APP}"; -/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:834; EDMarketConnector.py:857; */ +/* EDMarketConnector.py: Help > Check for Updates...; In files: EDMarketConnector.py:839; EDMarketConnector.py:862; */ "Check for Updates..." = "检查版本更新…"; -/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:835; EDMarketConnector.py:849; */ +/* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "保存原始数据…"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:836; EDMarketConnector.py:848; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ "Status" = "状态"; -/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:837; EDMarketConnector.py:855; */ +/* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ "Privacy Policy" = "隐私政策"; -/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:838; EDMarketConnector.py:856; EDMarketConnector.py:1595; */ +/* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "更新说明"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:850; EDMarketConnector.py:2003; prefs.py:254; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ "Settings" = "设置"; -/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:851; */ +/* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ "Exit" = "退出"; -/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:854; */ +/* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "帮助文档"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:861; ttkHyperlinkLabel.py:42; */ +/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ "Copy" = "复制"; -/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:867; */ +/* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "登录中…"; -/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:883; EDMarketConnector.py:1426; */ +/* EDMarketConnector.py: Successfully authenticated with the Frontier website; In files: EDMarketConnector.py:888; EDMarketConnector.py:1431; */ "Authentication successful" = "身份验证成功"; -/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:914; */ +/* EDMarketConnector.py: Player is not docked at a station, when we expect them to be; In files: EDMarketConnector.py:919; */ "You're not docked at a station!" = "你尚未靠站!"; -/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:922; */ +/* EDMarketConnector.py: Status - Either no market or no modules data for station from Frontier CAPI; In files: EDMarketConnector.py:927; */ "Station doesn't have anything!" = "此站点没有任何货物!"; -/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:927; */ +/* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "此站点没有货物市场!"; -/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1001; */ +/* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "取得数据…"; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1042; */ +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ "CAPI: No commander data returned" = "CAPI:没有指挥官数据"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1046; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ "Who are you?!" = "你是谁?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1052; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ "Where are you?!" = "你在哪里?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1059; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ "What are you flying?!" = "你在飞什么?!"; -/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1171; */ +/* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPI 服务器错误"; -/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1221; */ +/* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "最后更新于 %H:%M:%S"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1249; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1254; */ "Fighter" = "舰载机驾驶员"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1250; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1255; */ "Gunner" = "炮手"; -/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1251; */ +/* EDMarketConnector.py: Multicrew role; In files: EDMarketConnector.py:1256; */ "Helm" = "舵手"; -/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1509; */ +/* EDMarketConnector.py: Cooldown on 'Update' button; In files: EDMarketConnector.py:1514; */ "cooldown {SS}s" = "距离下次更新还有 {SS} 秒"; -/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1621; prefs.py:305; */ +/* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "确定"; -/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1688; */ +/* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "应用关闭中…"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:1991:1997; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "一项或多项你所启用的插件尚不支持 Python 3.x,详情请见 {FILE} > {SETTINGS} > {PLUGINS}。请检查上述插件是否有可用的更新,若没有,则应与插件的开发者就 Python 3.x 的支持问题取得联系。\n\n你也可以禁用某一项插件,只需在其文件夹名称的末尾添加 {DISABLED} 即可。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2001; prefs.py:976; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ "Plugins" = "插件"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2012; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC:不支持 Python 3.x 的插件"; /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ @@ -181,7 +181,7 @@ /* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ "Ignore" = "忽略"; -/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:467; prefs.py:701; prefs.py:734; */ +/* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "默认"; /* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ @@ -253,7 +253,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:519; prefs.py:1173; prefs.py:1206; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ "None" = "无"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ @@ -277,142 +277,145 @@ /* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ "Error: Inara {MSG}" = "错误:Inara {MSG}"; -/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:250; */ +/* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "偏好"; -/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:347; */ +/* prefs.py: Settings > Output - choosing what data to save to files; In files: prefs.py:348; */ "Please choose what data to save" = "请选择想要保存的数据"; -/* prefs.py: Settings > Output option; In files: prefs.py:353; */ +/* prefs.py: Settings > Output option; In files: prefs.py:354; */ "Market data in CSV format file" = "货物市场数据,以 CSV 文件格式"; -/* prefs.py: Settings > Output option; In files: prefs.py:362; */ +/* prefs.py: Settings > Output option; In files: prefs.py:363; */ "Market data in Trade Dangerous format file" = "货物市场数据,以 Trade Dangerous 文件格式"; -/* prefs.py: Settings > Output option; In files: prefs.py:372; */ +/* prefs.py: Settings > Output option; In files: prefs.py:373; */ "Ship loadout" = "飞船配置"; -/* prefs.py: Settings > Output option; In files: prefs.py:382; */ +/* prefs.py: Settings > Output option; In files: prefs.py:383; */ "Automatically update on docking" = "靠站时自动更新"; -/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:391; prefs.py:410; */ +/* prefs.py: Settings > Output - Label for "where files are located"; In files: prefs.py:392; prefs.py:411; */ "File location" = "保存位置"; -/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:399; prefs.py:449; */ +/* prefs.py: macOS Preferences - files location selection button; In files: prefs.py:400; prefs.py:450; */ "Change..." = "更改…"; -/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:402; prefs.py:452; */ +/* prefs.py: NOT-macOS Settings - files location selection button; prefs.py: NOT-macOS Setting - files location selection button; In files: prefs.py:403; prefs.py:453; */ "Browse..." = "浏览…"; -/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:417; */ +/* prefs.py: Label for 'Output' Settings/Preferences tab; In files: prefs.py:418; */ "Output" = "导出"; -/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:443; prefs.py:458; */ +/* prefs.py: Settings > Configuration - Label for Journal files location; In files: prefs.py:444; prefs.py:459; */ "E:D journal file location" = "E:D 日志文件位置"; -/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:483; */ +/* prefs.py: Hotkey/Shortcut settings prompt on OSX; In files: prefs.py:484; */ "Keyboard shortcut" = "键盘快捷键"; -/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:485; */ +/* prefs.py: Hotkey/Shortcut settings prompt on Windows; In files: prefs.py:486; */ "Hotkey" = "快捷键"; -/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:494; */ +/* prefs.py: macOS Preferences > Configuration - restart the app message; In files: prefs.py:495; */ "Re-start {APP} to use shortcuts" = "重启 {APP} 以使用快捷键"; -/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:503; */ +/* prefs.py: macOS - Configuration - need to grant the app permission for keyboard shortcuts; In files: prefs.py:504; */ "{APP} needs permission to use shortcuts" = "{APP} 需要权限以使用快捷键"; -/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:508; */ +/* prefs.py: Shortcut settings button on OSX; In files: prefs.py:509; */ "Open System Preferences" = "打开系统偏好设置"; -/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:530; */ +/* prefs.py: Configuration - Act on hotkey only when ED is in foreground; In files: prefs.py:531; */ "Only when Elite: Dangerous is the active app" = "仅当 Elite: Dangerous 在前台运行时生效"; -/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:541; */ +/* prefs.py: Configuration - play sound when hotkey used; In files: prefs.py:542; */ "Play sound" = "发出提示音"; -/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:556; */ +/* prefs.py: Configuration - disable checks for app updates when in-game; In files: prefs.py:557; */ "Disable Automatic Application Updates Check when in-game" = "当我在玩游戏时,禁止此应用自动检查版本更新。"; -/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:569; */ +/* prefs.py: Label for preferred shipyard, system and station 'providers'; In files: prefs.py:570; */ "Preferred websites" = "首选网站"; -/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:580; */ +/* prefs.py: Label for Shipyard provider selection; In files: prefs.py:581; */ "Shipyard" = "配船"; -/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:592; */ +/* prefs.py: Label for checkbox to utilise alternative Coriolis URL method; In files: prefs.py:593; */ "Use alternate URL method" = "若链接过长无法打开,请勾选此项"; -/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:645; */ +/* prefs.py: Configuration - Label for selection of Log Level; In files: prefs.py:646; */ "Log Level" = "诊断模式"; -/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:673; */ +/* prefs.py: Label for 'Configuration' tab in Settings; In files: prefs.py:674; */ "Configuration" = "通用"; -/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:683; */ "Main UI privacy options" = "用户界面隐私选项"; -/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:688; */ "Hide private group name in UI" = "在用户界面中隐藏私人组 (private group) 名称"; -/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:692; */ "Hide multi-crew captain name" = "在用户界面中隐藏多人共乘 (multi-crew) 时的舰长名称"; -/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +/* prefs.py: Preferences privacy tab title; In files: prefs.py:696; */ "Privacy" = "隐私"; -/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:708; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'normal' text colour; In files: prefs.py:709; */ "Normal text" = "普通文本"; -/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:710; */ +/* prefs.py: Label for Settings > Appeareance > selection of 'highlightes' text colour; In files: prefs.py:711; */ "Highlighted text" = "重点文本"; -/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:719; */ +/* prefs.py: Appearance - Label for selection of application display language; In files: prefs.py:720; */ "Language" = "语言"; -/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:729; */ +/* prefs.py: Label for Settings > Appearance > Theme selection; In files: prefs.py:730; */ "Theme" = "主题"; -/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:740; */ +/* prefs.py: Label for 'Dark' theme radio button; In files: prefs.py:741; */ "Dark" = "深色"; -/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:747; */ +/* prefs.py: Label for 'Transparent' theme radio button; In files: prefs.py:748; */ "Transparent" = "透明"; -/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:793; */ +/* prefs.py: Appearance - Label for selection of UI scaling; In files: prefs.py:794; */ "UI Scale Percentage" = "用户界面缩放比例"; -/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:814; */ +/* prefs.py: Appearance - Help/hint text for UI scaling selection; In files: prefs.py:815; */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 为默认设置{CR}需要重启应用{CR}以使修改生效"; -/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:824; */ +/* prefs.py: Appearance - Label for selection of main window transparency; In files: prefs.py:825; */ "Main window transparency" = "主窗口透明度"; -/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:844:847; */ +/* prefs.py: Appearance - Help/hint text for Main window transparency selection; In files: prefs.py:845:848; */ "100 means fully opaque.{CR}Window is updated in real time" = "100 为完全不透明{CR}效果实时更新"; -/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:883; */ +/* prefs.py: Appearance option for Windows "minimize to system tray"; In files: prefs.py:877; */ +"Minimize to system tray" = "最小化到系统托盘"; + +/* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "外观"; -/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:898; */ +/* prefs.py: Label for location of third-party plugins folder; In files: prefs.py:900; */ "Plugins folder" = "插件文件夹"; -/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:905; */ +/* prefs.py: Label on button used to open a filesystem folder; In files: prefs.py:907; */ "Open" = "打开"; -/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:913; */ +/* prefs.py: Tip/label about how to disable plugins; In files: prefs.py:915; */ "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "提示:想要禁用某一项插件,{CR}你可以添加 {EXT} 到其文件夹名称中"; -/* prefs.py: Label on list of enabled plugins; In files: prefs.py:924; */ +/* prefs.py: Label on list of enabled plugins; In files: prefs.py:926; */ "Enabled Plugins" = "已启用插件"; -/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:944; */ +/* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:946; */ "Plugins Without Python 3.x Support:" = "不支持 Python 3.x 的插件:"; -/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:952; */ +/* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:954; */ "Information on migrating plugins" = "关于插件迁移"; -/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:967; */ +/* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "已禁用插件"; /* stats.py: Cmdr stats; In files: stats.py:53; */ From 2d729ec237683d044804e82b1105deffb03c2234 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 22 Nov 2021 11:08:03 +0000 Subject: [PATCH 220/527] Release 5.2.3: appversion & changelog --- ChangeLog.md | 11 +++++++++-- config.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index acfceb95..9bdc3ad7 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,10 +27,10 @@ produce the Windows executables and installer. --- -Pre-Release 5.2.3-beta1 +Release 5.2.3 === -This release fixes one bug. +This release fixes one bug and fixes some example code. * Odyssey changed the order of some Journal events. This caused our logic for tracking the following to break, and thus not report them ever to Inara: @@ -48,6 +48,13 @@ Developers * Now built using Python 3.9.9. +* Updated [PLUGINS.md](https://github.com/EDCD/EDMarketConnector/blob/main/PLUGINS.md#packaging-extra-modules) + to state that we don't actually include *all* of Python's standard library. + +* The [click_counter](https://github.com/EDCD/EDMarketConnector/tree/main/docs/examples/click_counter) + example plugin code has been corrected to both actually work fully, and pass + our linting. + --- Release 5.2.2 diff --git a/config.py b/config.py index 65b8248e..22663eab 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.3-beta1' +_static_appversion = '5.2.3' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From c17716a7f921e58d154b7412a826dc52cbbf12df Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 22 Nov 2021 11:09:18 +0000 Subject: [PATCH 221/527] develop: Reset appversion to 5.3.0-beta0 --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 22663eab..053eb0d7 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.3' +_static_appversion = '5.3.0-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 37533ed2638fb2b0249cc22620395f1d71d3ac04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 17:03:47 +0000 Subject: [PATCH 222/527] build(deps-dev): bump types-requests from 2.26.0 to 2.26.1 Bumps [types-requests](https://github.com/python/typeshed) from 2.26.0 to 2.26.1. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d3c22835..0f8dae5f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.910 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.26.0 +types-requests==2.26.1 # Code formatting tools autopep8==1.6.0 From 94a959b0cd3fb79f7188623378b004a37e6d8cf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:03:28 +0000 Subject: [PATCH 223/527] build(deps): bump actions/setup-python from 2.3.0 to 2.3.1 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.3.0...v2.3.1) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index f6a6d44b..a1472e27 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -53,7 +53,7 @@ jobs: # Get Python set up #################################################################### - name: Set up Python 3.9 - uses: actions/setup-python@v2.3.0 + uses: actions/setup-python@v2.3.1 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 94bbcbd3..5f78645f 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python 3.9 - uses: actions/setup-python@v2.3.0 + uses: actions/setup-python@v2.3.1 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 5f394a24..9a30947a 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2.3.0 + - uses: actions/setup-python@v2.3.1 with: python-version: "3.9.9" architecture: "x86" From eda2ace51b620a21f925ea33390b66d27d4ef1a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:03:42 +0000 Subject: [PATCH 224/527] build(deps-dev): bump coverage[toml] from 6.1.2 to 6.2 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.1.2 to 6.2. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.1.2...6.2) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0f8dae5f..3b443e17 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ py2exe==0.10.4.1; sys_platform == 'win32' # Testing pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.1.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==302; sys_platform == 'win32' From 42fea4ec349f7216e0ca60349b779f68fa5aacca Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 29 Nov 2021 17:47:25 +0000 Subject: [PATCH 225/527] EDDN: Set custom User-Agent --- plugins/eddn.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 171807b2..c2bb11c9 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -21,7 +21,7 @@ import killswitch import myNotebook as nb # noqa: N813 import plug from companion import CAPIData, category_map -from config import applongname, appversion_nobuild, config, debug_senders +from config import applongname, appname, appversion, appversion_nobuild, config, debug_senders from EDMCLogging import get_main_logger from monitor import monitor from myNotebook import Frame @@ -101,6 +101,9 @@ HORIZONS_SKU = 'ELITE_HORIZONS_V_PLANETARY_LANDINGS' # Thus do **NOT** use either of these in addition to the PLANETARY_LANDINGS # one. +# Custom user agent, to be clear in EDDN logs +USER_AGENT = f'EDCD-{appname}-{appversion()}' + # TODO: a good few of these methods are static or could be classmethods. they should be created as such. @@ -125,6 +128,7 @@ class EDDN: def __init__(self, parent: tk.Tk): self.parent: tk.Tk = parent self.session = requests.Session() + self.session.headers['User-Agent'] = USER_AGENT self.replayfile: Optional[TextIO] = None # For delayed messages self.replaylog: List[str] = [] From 2fd72fde8e9fed19250ca99e5d8b1eb96475b083 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 29 Nov 2021 17:51:19 +0000 Subject: [PATCH 226/527] EDSM: Set custom User-Agent for requests session --- plugins/edsm.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/edsm.py b/plugins/edsm.py index 33a39804..781994ab 100644 --- a/plugins/edsm.py +++ b/plugins/edsm.py @@ -23,7 +23,7 @@ import killswitch import myNotebook as nb # noqa: N813 import plug from companion import CAPIData -from config import applongname, appversion, config, debug_senders +from config import applongname, appname, appversion, config, debug_senders from edmc_data import DEBUG_WEBSERVER_HOST, DEBUG_WEBSERVER_PORT from EDMCLogging import get_main_logger from ttkHyperlinkLabel import HyperlinkLabel @@ -37,6 +37,8 @@ logger = get_main_logger() EDSM_POLL = 0.1 _TIMEOUT = 20 DISCARDED_EVENTS_SLEEP = 10 +# Custom user agent +USER_AGENT = f'EDCD-{appname}-{appversion()}' # trace-if events CMDR_EVENTS = 'plugin.edsm.cmdr-events' @@ -49,6 +51,7 @@ class This: self.shutting_down = False # Plugin is shutting down. self.session: requests.Session = requests.Session() + self.session.headers['User-Agent'] = USER_AGENT self.queue: Queue = Queue() # Items to be sent to EDSM by worker thread self.discarded_events: Set[str] = [] # List discarded events from EDSM self.lastlookup: requests.Response # Result of last system lookup From 4ab6d6292622fc8422cd4512d05950df7092b36f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 29 Nov 2021 18:04:56 +0000 Subject: [PATCH 227/527] user_agent: Set this once in config.py and use it everywhere * Also flake8/mypy pass on timeout_session.py --- companion.py | 7 +++---- config.py | 3 +++ plugins/eddn.py | 7 ++----- plugins/edsm.py | 6 ++---- timeout_session.py | 17 ++++++++++------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/companion.py b/companion.py index a518fac1..9a175a1d 100644 --- a/companion.py +++ b/companion.py @@ -30,7 +30,7 @@ import requests import config as conf_module import protocol -from config import appname, appversion, config +from config import config, user_agent from edmc_data import companion_category_map as category_map from EDMCLogging import get_main_logger from monitor import monitor @@ -54,7 +54,6 @@ auth_timeout = 30 # timeout for initial auth # Used by both class Auth and Session FRONTIER_AUTH_SERVER = 'https://auth.frontierstore.net' -USER_AGENT = f'EDCD-{appname}-{appversion()}' SERVER_LIVE = 'https://companion.orerve.net' SERVER_BETA = 'https://pts-companion.orerve.net' @@ -305,7 +304,7 @@ class Auth(object): def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr self.requests_session = requests.Session() - self.requests_session.headers['User-Agent'] = USER_AGENT + self.requests_session.headers['User-Agent'] = user_agent self.verifier: Union[bytes, None] = None self.state: Union[str, None] = None @@ -644,7 +643,7 @@ class Session(object): logger.debug('Starting session') self.requests_session = requests.Session() self.requests_session.headers['Authorization'] = f'Bearer {access_token}' - self.requests_session.headers['User-Agent'] = USER_AGENT + self.requests_session.headers['User-Agent'] = user_agent self.state = Session.STATE_OK def login(self, cmdr: str = None, is_beta: Optional[bool] = None) -> bool: diff --git a/config.py b/config.py index 053eb0d7..882bd4c5 100644 --- a/config.py +++ b/config.py @@ -164,6 +164,9 @@ def appversion() -> semantic_version.Version: return _cached_version +user_agent = f'EDCD-{appname}-{appversion()}' + + def appversion_nobuild() -> semantic_version.Version: """ Determine app version without *any* build meta data. diff --git a/plugins/eddn.py b/plugins/eddn.py index c2bb11c9..37165ea1 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -21,7 +21,7 @@ import killswitch import myNotebook as nb # noqa: N813 import plug from companion import CAPIData, category_map -from config import applongname, appname, appversion, appversion_nobuild, config, debug_senders +from config import applongname, appversion_nobuild, config, debug_senders, user_agent from EDMCLogging import get_main_logger from monitor import monitor from myNotebook import Frame @@ -101,9 +101,6 @@ HORIZONS_SKU = 'ELITE_HORIZONS_V_PLANETARY_LANDINGS' # Thus do **NOT** use either of these in addition to the PLANETARY_LANDINGS # one. -# Custom user agent, to be clear in EDDN logs -USER_AGENT = f'EDCD-{appname}-{appversion()}' - # TODO: a good few of these methods are static or could be classmethods. they should be created as such. @@ -128,7 +125,7 @@ class EDDN: def __init__(self, parent: tk.Tk): self.parent: tk.Tk = parent self.session = requests.Session() - self.session.headers['User-Agent'] = USER_AGENT + self.session.headers['User-Agent'] = user_agent self.replayfile: Optional[TextIO] = None # For delayed messages self.replaylog: List[str] = [] diff --git a/plugins/edsm.py b/plugins/edsm.py index 781994ab..31f5a317 100644 --- a/plugins/edsm.py +++ b/plugins/edsm.py @@ -23,7 +23,7 @@ import killswitch import myNotebook as nb # noqa: N813 import plug from companion import CAPIData -from config import applongname, appname, appversion, config, debug_senders +from config import applongname, appversion, config, debug_senders, user_agent from edmc_data import DEBUG_WEBSERVER_HOST, DEBUG_WEBSERVER_PORT from EDMCLogging import get_main_logger from ttkHyperlinkLabel import HyperlinkLabel @@ -37,8 +37,6 @@ logger = get_main_logger() EDSM_POLL = 0.1 _TIMEOUT = 20 DISCARDED_EVENTS_SLEEP = 10 -# Custom user agent -USER_AGENT = f'EDCD-{appname}-{appversion()}' # trace-if events CMDR_EVENTS = 'plugin.edsm.cmdr-events' @@ -51,7 +49,7 @@ class This: self.shutting_down = False # Plugin is shutting down. self.session: requests.Session = requests.Session() - self.session.headers['User-Agent'] = USER_AGENT + self.session.headers['User-Agent'] = user_agent self.queue: Queue = Queue() # Items to be sent to EDSM by worker thread self.discarded_events: Set[str] = [] # List discarded events from EDSM self.lastlookup: requests.Response # Result of last system lookup diff --git a/timeout_session.py b/timeout_session.py index 3da5e3ab..6faf54bb 100644 --- a/timeout_session.py +++ b/timeout_session.py @@ -1,22 +1,24 @@ - +"""A requests.session with a TimeoutAdapter.""" import requests from requests.adapters import HTTPAdapter +from config import user_agent + REQUEST_TIMEOUT = 10 # reasonable timeout that all HTTP requests should use class TimeoutAdapter(HTTPAdapter): - """ - TimeoutAdapter is an HTTP Adapter that enforces an overridable default timeout on HTTP requests. - """ - def __init__(self, timeout, *args, **kwargs): + """An HTTP Adapter that enforces an overridable default timeout on HTTP requests.""" + + def __init__(self, timeout: int, *args, **kwargs): self.default_timeout = timeout if kwargs.get("timeout") is not None: del kwargs["timeout"] super().__init__(*args, **kwargs) - def send(self, *args, **kwargs): + def send(self, *args, **kwargs) -> requests.Response: + """Send, but with a timeout always set.""" if kwargs["timeout"] is None: kwargs["timeout"] = self.default_timeout @@ -25,7 +27,7 @@ class TimeoutAdapter(HTTPAdapter): def new_session(timeout: int = REQUEST_TIMEOUT, session: requests.Session = None) -> requests.Session: """ - new_session creates a new requests.Session and overrides the default HTTPAdapter with a TimeoutAdapter. + Create a new requests.Session and override the default HTTPAdapter with a TimeoutAdapter. :param timeout: the timeout to set the TimeoutAdapter to, defaults to REQUEST_TIMEOUT :param session: the Session object to attach the Adapter to, defaults to a new session @@ -33,6 +35,7 @@ def new_session(timeout: int = REQUEST_TIMEOUT, session: requests.Session = None """ if session is None: session = requests.Session() + session.headers['User-Agent'] = user_agent adapter = TimeoutAdapter(timeout) session.mount("http://", adapter) From 3a28945ad5696f5e0f50ffeee6ece017cb77a050 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 3 Dec 2021 11:17:18 +0000 Subject: [PATCH 228/527] Python 3.10: Change version number in most of our local files The requirements-dev.txt change for py2exe will be in a separate commit. --- .github/workflows/windows-build.yml | 2 +- .pre-commit-config.yaml | 2 +- .python-version | 2 +- EDMarketConnector.wxs | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 9a30947a..74f8ebe8 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.4.0 - uses: actions/setup-python@v2.3.1 with: - python-version: "3.9.9" + python-version: "3.10.0" architecture: "x86" - name: Install python tools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a8bfb90c..a6effa3b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: always_run: true default_language_version: - python: python3.9 + python: python3.10 default_stages: [ commit, push ] diff --git a/.python-version b/.python-version index b04bfd83..30291cba 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.9 +3.10.0 diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs index c24a594f..afa69e1a 100644 --- a/EDMarketConnector.wxs +++ b/EDMarketConnector.wxs @@ -198,7 +198,7 @@ - + diff --git a/setup.py b/setup.py index 183a7383..52be2c78 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ from config import ( ) from constants import GITVERSION_FILE -if sys.version_info[0:2] != (3, 9): +if sys.version_info[0:2] != (3, 10): raise AssertionError(f'Unexpected python version {sys.version}') ########################################################################### From d546e84031e39f68cc7e60821d5b158c42ef93a5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 3 Dec 2021 11:40:31 +0000 Subject: [PATCH 229/527] Python 3.10: Bump py2exe version --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3b443e17..afc11caf 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -28,7 +28,7 @@ grip==4.5.2 # Packaging # We only need py2exe on windows. -py2exe==0.10.4.1; sys_platform == 'win32' +py2exe==0.11.0.1; sys_platform == 'win32' # Testing pytest==6.2.5 From 74c2c295bcabfac02bf97bf718cf486b4edc6994 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 3 Dec 2021 11:47:14 +0000 Subject: [PATCH 230/527] Python 3.10: Remove un-necessary pyd files _aynscio.pyd _multiprocessing.pyd _overlapped.pyd They do still exist in Python 3.10, but we don't use them and it seems py2exe is no longer causing their inclusion in the build. --- EDMarketConnector.wxs | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs index afa69e1a..d56dff92 100644 --- a/EDMarketConnector.wxs +++ b/EDMarketConnector.wxs @@ -113,9 +113,6 @@ - - - @@ -134,12 +131,6 @@ - - - - - - @@ -152,9 +143,6 @@ - - - @@ -562,20 +550,16 @@ - - - - @@ -604,7 +588,7 @@ - + From bb65718cef0703c8f1c3723a4314d7f71ae59063 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 3 Dec 2021 12:21:36 +0000 Subject: [PATCH 231/527] Python 3.10: Final adjustments to .wxs file We were missing some new files which seemed to be the cause of issues with the definitely included and installed _tkinter.pyd. I think it was due to missing _win32sysloader.pyd but didn't test in detail. --- EDMarketConnector.wxs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs index d56dff92..621aafa2 100644 --- a/EDMarketConnector.wxs +++ b/EDMarketConnector.wxs @@ -146,6 +146,12 @@ + + + + + + @@ -188,6 +194,12 @@ + + + + + + @@ -215,6 +227,15 @@ + + + + + + + + + @@ -561,6 +582,8 @@ + + @@ -589,6 +612,8 @@ + + @@ -604,6 +629,9 @@ + + + From 8be6a53f43468198ff36e26cfdeb9625098ca782 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 4 Dec 2021 09:26:23 +0000 Subject: [PATCH 232/527] Python 3.10: Change tcl/tk DLLs to '*' GUID For reasons not logged by: msiexec /l*vx 5.3.0-beta0-install.txt /i EDMarketConnector_win_5.3.0-beta0.msi if you install the GitHub-built 5.3.0-beta0 installer in place of 5.2.3 the two files tcl86t.dll & tk86t.dll do not get installed. Other than WinSparkle.dll (which won't have changed in a long time) they're the only two DLL files with a hard-coded GUID. So let's try changing them to '*'. --- EDMarketConnector.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs index 621aafa2..d5d145bc 100644 --- a/EDMarketConnector.wxs +++ b/EDMarketConnector.wxs @@ -218,10 +218,10 @@ - + - + From 5b20451209f5df21acec14772761f6eeb8fdfe89 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 5 Dec 2021 11:34:12 +0000 Subject: [PATCH 233/527] Revert "Python 3.10: Change tcl/tk DLLs to '*' GUID" This reverts commit 8be6a53f43468198ff36e26cfdeb9625098ca782. It didn't help and will potentially cause other issues. --- EDMarketConnector.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs index d5d145bc..621aafa2 100644 --- a/EDMarketConnector.wxs +++ b/EDMarketConnector.wxs @@ -218,10 +218,10 @@ - + - + From 342edf57d4a4bf4d2886c6c3a58447aeb40e1196 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 11:03:00 +0000 Subject: [PATCH 234/527] Python: Bump 3.10.1 --- .github/workflows/windows-build.yml | 2 +- .python-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 74f8ebe8..80b61487 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.4.0 - uses: actions/setup-python@v2.3.1 with: - python-version: "3.10.0" + python-version: "3.10.1" architecture: "x86" - name: Install python tools diff --git a/.python-version b/.python-version index 30291cba..f870be23 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.0 +3.10.1 From f3b5f2b4ede9d6c570540df93b938b78194f442f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 11:28:11 +0000 Subject: [PATCH 235/527] Pre-Release 5.3.0-beta1: appversion & changelog --- ChangeLog.md | 35 ++++++++++++++++++++++++++++++++++- config.py | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9bdc3ad7..5c2f7e73 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.9.9. +* We now test against, and package with, Python 3.10.1. **As a consequence of this we no longer support Windows 7. This is due to @@ -25,6 +25,39 @@ produce the Windows executables and installer. in the source (it's not distributed with the Windows installer) for the currently used version in a given branch. +--- +Pre-Release 5.3.0-beta1 +=== + +This is a test release to ensure packaging with Python 3.10.1 is working +correctly. There is also a small change to metadata in any remote web +request we make. + +* We now set a custom User-Agent header in all web requests, i.e. to EDDN, + EDSM and the like. This is of the form: + + `EDCD-EDMarketConnector-` + +Developers +--- + +We now test against, and package with Python 3.10.1. + +We've made no explicit changes to the Python stdlib, or other modules, we +currently offer. However, the newer [py2exe](https://github.com/py2exe/py2exe/) +we now use has decided we no longer need: + + - _aynscio.pyd + - _multiprocessing.pyd + - _overlapped.pyd + +so those are no longer included in the Windows installers. We are looking into +[including all of Python stdlib](https://github.com/EDCD/EDMarketConnector/issues/1327) +so this would be resolved by that. + +If your plugin utilises any module/package that requires per-architecture +libraries then you should check it has Python 3.10 wheels available. + --- Release 5.2.3 diff --git a/config.py b/config.py index 882bd4c5..7df3e218 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta0' +_static_appversion = '5.3.0-beta1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 43394b17ffcf908b3747e1985075755dca002872 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 15:27:33 +0000 Subject: [PATCH 236/527] Initial work on auto-generating WiX Component list * We'll be generating EDMarketConnector.wxs, so remove it from git and add to .gitignore * Initial work on using `lxml` to parse in wix/components.wxs, generated by heat.exe, to pick out what we need, modify it, and eventually stitch into a generated EDMarketConnector.wxs --- .gitignore | 1 + EDMarketConnector.wxs | 724 ------------------------------------------ setup.py | 63 ++++ 3 files changed, 64 insertions(+), 724 deletions(-) delete mode 100644 EDMarketConnector.wxs diff --git a/.gitignore b/.gitignore index 7474987d..49459783 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ venv htmlcov/ .ignored .coverage +EDMarketConnector.wxs diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs deleted file mode 100644 index 621aafa2..00000000 --- a/EDMarketConnector.wxs +++ /dev/null @@ -1,724 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION - - - - - WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION - - - - - - - - - NOT Installed - - - - - - - - - - NOT Installed AND LAUNCH ~= "yes" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/setup.py b/setup.py index 52be2c78..a87773f6 100755 --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ Script to build to .exe and .msi package. import codecs import os +import pathlib import platform import re import shutil @@ -18,6 +19,8 @@ from os.path import exists, isdir, join from tempfile import gettempdir from typing import Any, Generator, Set +from lxml import etree + from config import ( appcmdname, applongname, appname, appversion, appversion_nobuild, copyright, git_shorthash_from_head, update_feed, update_interval @@ -283,6 +286,66 @@ if sys.platform == 'darwin': os.system(f'cd {dist_dir}; ditto -ck --keepParent --sequesterRsrc {appname}.app ../{package_filename}; cd ..') elif sys.platform == 'win32': + header_file = pathlib.Path('wix/header.wxs') + components_file = pathlib.Path('wix/components.wxs') + components_transformed_file = pathlib.Path(r'wix/components_transformed.wxs') + + header_tree = etree.parse(header_file) + # Use heat.exe to generate the Component for all files inside dist.win32 + os.system(rf'"{WIXPATH}\heat.exe" dir {dist_dir}\ -ag -sfrag -srid -suid -out {components_file}') + + component_tree = etree.parse(components_file) + # 1. Change the element: + # + # + # + # to: + # + # + win32 = component_tree.find('.//{*}Directory[@Id="dist.win32"][@Name="dist.win32"]') + if not win32: + raise ValueError(f'{components_file}: Expected Directory with Id="dist.win32"') + + win32.set('Id', 'INSTALLDIR') + win32.set('Name', '$(var.PRODUCTNAME)') + # 2. Change: + # + # + # + # + # + # to: + # + # + # + # + # + main_executable = win32.find('.//{*}Component[@Id="EDMarketConnector.exe"]') + if not main_executable: + raise ValueError(f'{components_file}: Expected Component with Id="EDMarketConnector.exe"') + + main_executable.set('Id', 'MainExecutable') + main_executable.set('Guid', '{D33BB66E-9664-4AB6-A044-3004B50A09B0}') + shortcut = etree.SubElement( + main_executable, + 'Shortcut', + nsmap=main_executable.nsmap, + attrib={ + 'Id': 'MainExeShortcut', + 'Directory': 'ProgramMenuFolder', + 'Name': '$(var.PRODUCTLONGNAME)', + 'Description': 'Downloads station data from Elite: Dangerous', + 'WorkingDirectory': 'INSTALLDIR', + 'Icon': 'EDMarketConnector.exe', + 'IconIndex': '0', + 'Advertise': 'yes' + } + ) + + # Append the Feature/ComponentRef listing to match + # Concatenate our header, this middle, and our footer. os.system(rf'"{WIXPATH}\candle.exe" -out {dist_dir}\ {appname}.wxs') if not exists(f'{dist_dir}/{appname}.wixobj'): From 6ed64c9d6b5e0202b27101e92c7fc04478d9bf0b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 15:51:38 +0000 Subject: [PATCH 237/527] WiX: .gitignore components.wxs & add template.wxs Also renamed header.wxs to template.wxs in setup.py, as we're going to insert into the middle of its content, not use it as a simple concatenated header. --- .gitignore | 1 + setup.py | 8 +-- wix/template.wxs | 126 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 wix/template.wxs diff --git a/.gitignore b/.gitignore index 49459783..9bea3d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ htmlcov/ .ignored .coverage EDMarketConnector.wxs +wix/components.wxs diff --git a/setup.py b/setup.py index a87773f6..afb4233c 100755 --- a/setup.py +++ b/setup.py @@ -286,11 +286,10 @@ if sys.platform == 'darwin': os.system(f'cd {dist_dir}; ditto -ck --keepParent --sequesterRsrc {appname}.app ../{package_filename}; cd ..') elif sys.platform == 'win32': - header_file = pathlib.Path('wix/header.wxs') + template_file = pathlib.Path('wix/template.wxs') components_file = pathlib.Path('wix/components.wxs') components_transformed_file = pathlib.Path(r'wix/components_transformed.wxs') - header_tree = etree.parse(header_file) # Use heat.exe to generate the Component for all files inside dist.win32 os.system(rf'"{WIXPATH}\heat.exe" dir {dist_dir}\ -ag -sfrag -srid -suid -out {components_file}') @@ -345,7 +344,10 @@ elif sys.platform == 'win32': ) # Append the Feature/ComponentRef listing to match - # Concatenate our header, this middle, and our footer. + + template_tree = etree.parse(template_file) + # Insert what we now have into the template and write it out + os.system(rf'"{WIXPATH}\candle.exe" -out {dist_dir}\ {appname}.wxs') if not exists(f'{dist_dir}/{appname}.wixobj'): diff --git a/wix/template.wxs b/wix/template.wxs new file mode 100644 index 00000000..0d365919 --- /dev/null +++ b/wix/template.wxs @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION + + + + + WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION + + + + + + + + + NOT Installed + + + + + + + + + + NOT Installed AND LAUNCH ~= "yes" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ff32c299cf4053e79fb3e524144fe60fc159a04f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 16:16:27 +0000 Subject: [PATCH 238/527] WiX: Insertion of heat.exe produced Components now working --- setup.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index afb4233c..e829b74d 100755 --- a/setup.py +++ b/setup.py @@ -288,12 +288,12 @@ if sys.platform == 'darwin': elif sys.platform == 'win32': template_file = pathlib.Path('wix/template.wxs') components_file = pathlib.Path('wix/components.wxs') - components_transformed_file = pathlib.Path(r'wix/components_transformed.wxs') + final_wxs_file = pathlib.Path('wix/final.wxs') # Use heat.exe to generate the Component for all files inside dist.win32 os.system(rf'"{WIXPATH}\heat.exe" dir {dist_dir}\ -ag -sfrag -srid -suid -out {components_file}') - component_tree = etree.parse(components_file) + component_tree = etree.parse(str(components_file)) # 1. Change the element: # # @@ -301,12 +301,12 @@ elif sys.platform == 'win32': # to: # # - win32 = component_tree.find('.//{*}Directory[@Id="dist.win32"][@Name="dist.win32"]') - if not win32: + directory_win32 = component_tree.find('.//{*}Directory[@Id="dist.win32"][@Name="dist.win32"]') + if directory_win32 is None: raise ValueError(f'{components_file}: Expected Directory with Id="dist.win32"') - win32.set('Id', 'INSTALLDIR') - win32.set('Name', '$(var.PRODUCTNAME)') + directory_win32.set('Id', 'INSTALLDIR') + directory_win32.set('Name', '$(var.PRODUCTNAME)') # 2. Change: # # @@ -321,8 +321,8 @@ elif sys.platform == 'win32': # Description="Downloads station data from Elite: Dangerous" WorkingDirectory="INSTALLDIR" # Icon="EDMarketConnector.exe" IconIndex="0" Advertise="yes" /> # - main_executable = win32.find('.//{*}Component[@Id="EDMarketConnector.exe"]') - if not main_executable: + main_executable = directory_win32.find('.//{*}Component[@Id="EDMarketConnector.exe"]') + if main_executable is None: raise ValueError(f'{components_file}: Expected Component with Id="EDMarketConnector.exe"') main_executable.set('Id', 'MainExecutable') @@ -342,11 +342,22 @@ elif sys.platform == 'win32': 'Advertise': 'yes' } ) + # Now insert the appropriate parts as a child of the ProgramFilesFolder part + # of the template. + template_tree = etree.parse(str(template_file)) + program_files_folder = template_tree.find('.//{*}Directory[@Id="ProgramFilesFolder"]') + if program_files_folder is None: + raise ValueError(f'{template_file}: Expected Directory with Id="ProgramFilesFolder"') + program_files_folder.insert(0, directory_win32) # Append the Feature/ComponentRef listing to match - template_tree = etree.parse(template_file) # Insert what we now have into the template and write it out + template_tree.write( + str(final_wxs_file), encoding='utf-8', + pretty_print=True, + xml_declaration=True + ) os.system(rf'"{WIXPATH}\candle.exe" -out {dist_dir}\ {appname}.wxs') From 931740f6401bc6948816e7117b8cfeb8112e47a3 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 16:17:38 +0000 Subject: [PATCH 239/527] WiX: Re-add the hard-coded EDMarketConnector.wxs inside wix/ folder So that it's around for reference. --- .gitignore | 1 - wix/EDMarketConnector.wxs | 724 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 724 insertions(+), 1 deletion(-) create mode 100644 wix/EDMarketConnector.wxs diff --git a/.gitignore b/.gitignore index 9bea3d5a..989d6405 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,4 @@ venv htmlcov/ .ignored .coverage -EDMarketConnector.wxs wix/components.wxs diff --git a/wix/EDMarketConnector.wxs b/wix/EDMarketConnector.wxs new file mode 100644 index 00000000..d19dfa67 --- /dev/null +++ b/wix/EDMarketConnector.wxs @@ -0,0 +1,724 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION + + + + + WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION + + + + + + + + + NOT Installed + + + + + + + + + + NOT Installed AND LAUNCH ~= "yes" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0af2af344deba8d2e8af2248e65e80749bbbae3c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 16:18:26 +0000 Subject: [PATCH 240/527] WiX: Output to final .wxs to expected filename for next stages --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e829b74d..bfab647d 100755 --- a/setup.py +++ b/setup.py @@ -288,7 +288,7 @@ if sys.platform == 'darwin': elif sys.platform == 'win32': template_file = pathlib.Path('wix/template.wxs') components_file = pathlib.Path('wix/components.wxs') - final_wxs_file = pathlib.Path('wix/final.wxs') + final_wxs_file = pathlib.Path('EDMarketConnector.wxs') # Use heat.exe to generate the Component for all files inside dist.win32 os.system(rf'"{WIXPATH}\heat.exe" dir {dist_dir}\ -ag -sfrag -srid -suid -out {components_file}') From a196bfe1722dfd9f9ee368ffdabd03a148b30ba7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 16:48:11 +0000 Subject: [PATCH 241/527] WiX: Autogeneration of EDMarketConnector.wxs fully working * Changed config version to 5.3.0-beta2 to be sure during testing. * Fixed the case on ChangeLog.md in setup.py py2exe config. * Replaced all TABs with <4 spaces> in wix/template.wxs. * Now generating the correct Feature tree in the output file. NB: The 'RegistryEntries' isn't part of the file Components but still needs to be referenced inside . --- config.py | 2 +- setup.py | 26 ++++++- wix/template.wxs | 194 +++++++++++++++++++++++------------------------ 3 files changed, 123 insertions(+), 99 deletions(-) diff --git a/config.py b/config.py index 7df3e218..ff0b7fed 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta1' +_static_appversion = '5.3.0-beta2' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' diff --git a/setup.py b/setup.py index bfab647d..ba88ce7c 100755 --- a/setup.py +++ b/setup.py @@ -212,7 +212,7 @@ elif sys.platform == 'win32': 'WinSparkle.dll', 'WinSparkle.pdb', # For debugging - don't include in package 'EUROCAPS.TTF', - 'Changelog.md', + 'ChangeLog.md', 'commodity.csv', 'rare_commodity.csv', 'snd_good.wav', @@ -351,6 +351,30 @@ elif sys.platform == 'win32': program_files_folder.insert(0, directory_win32) # Append the Feature/ComponentRef listing to match + feature = template_tree.find('.//{*}Feature[@Id="Complete"][@Level="1"]') + if feature is None: + raise ValueError(f'{template_file}: Expected Feature element with Id="Complete" Level="1"') + + # This isn't part of the components + feature.append( + etree.Element( + 'ComponentRef', + attrib={ + 'Id': 'RegistryEntries' + }, + nsmap=directory_win32.nsmap + ) + ) + for c in directory_win32.findall('.//{*}Component'): + feature.append( + etree.Element( + 'ComponentRef', + attrib={ + 'Id': c.get('Id') + }, + nsmap=directory_win32.nsmap + ) + ) # Insert what we now have into the template and write it out template_tree.write( diff --git a/wix/template.wxs b/wix/template.wxs index 0d365919..7e4409a4 100644 --- a/wix/template.wxs +++ b/wix/template.wxs @@ -6,119 +6,119 @@ - + - - - + + + - - - + + + - + - + - - - - + + + + - - - - - - - - - WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION - - - - - WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION - - + + + + + + + + + WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION + + + + + WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION + + - - - - - - NOT Installed - - + + + + + + NOT Installed + + - - - - - - - NOT Installed AND LAUNCH ~= "yes" - - + + + + + + + NOT Installed AND LAUNCH ~= "yes" + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - + - - + + - + From 97f025e1b96f1092a38f1c944b2007ad49fd2895 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 17:08:58 +0000 Subject: [PATCH 242/527] requirements-dev: Add lxml, used for Windows packaging --- requirements-dev.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index afc11caf..221b5997 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -27,6 +27,8 @@ autopep8==1.6.0 grip==4.5.2 # Packaging +# Used to put together a WiX configuration from template/auto-gen +lxml==4.6.4 # We only need py2exe on windows. py2exe==0.11.0.1; sys_platform == 'win32' From ee66b9deb1b3396d1522cf6e1ca7beb822be2016 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 17:16:21 +0000 Subject: [PATCH 243/527] WiX: Move EDMarketConnector.wixobj to root directory * Don't specify its generation inside dist.win32/ * Specify `-b dist.win32\` to light.exe invocation Tested with installing resultant .msi over 5.2.3. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index ba88ce7c..8bb8fb30 100755 --- a/setup.py +++ b/setup.py @@ -383,13 +383,13 @@ elif sys.platform == 'win32': xml_declaration=True ) - os.system(rf'"{WIXPATH}\candle.exe" -out {dist_dir}\ {appname}.wxs') + os.system(rf'"{WIXPATH}\candle.exe" {appname}.wxs') - if not exists(f'{dist_dir}/{appname}.wixobj'): - raise AssertionError(f'No {dist_dir}/{appname}.wixobj: candle.exe failed?') + if not exists(f'{appname}.wixobj'): + raise AssertionError(f'No {appname}.wixobj: candle.exe failed?') package_filename = f'{appname}_win_{appversion_nobuild()}.msi' - os.system(rf'"{WIXPATH}\light.exe" -sacl -spdb -sw1076 {dist_dir}\{appname}.wixobj -out {package_filename}') + os.system(rf'"{WIXPATH}\light.exe" -b {dist_dir}\ -sacl -spdb -sw1076 {appname}.wixobj -out {package_filename}') if not exists(package_filename): raise AssertionError(f'light.exe failed, no {package_filename}') From 6737ab932292d4b60ebbf72e7dfb92a453782c70 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 17:20:44 +0000 Subject: [PATCH 244/527] WiX: Rename to wix/static-EDMarketConnector.wxs and .gitignore generated --- .gitignore | 1 + wix/{EDMarketConnector.wxs => static-EDMarketConnector.wxs} | 0 2 files changed, 1 insertion(+) rename wix/{EDMarketConnector.wxs => static-EDMarketConnector.wxs} (100%) diff --git a/.gitignore b/.gitignore index 989d6405..9bea3d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ venv htmlcov/ .ignored .coverage +EDMarketConnector.wxs wix/components.wxs diff --git a/wix/EDMarketConnector.wxs b/wix/static-EDMarketConnector.wxs similarity index 100% rename from wix/EDMarketConnector.wxs rename to wix/static-EDMarketConnector.wxs From 43d98bff1c847e56811408003ce327f3e07f88f7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 17:36:51 +0000 Subject: [PATCH 245/527] WiX: Add/update comments in template.wxs about auto-generation We *are* now using auto GUIDs. It worked for a 5.2.3 -> 5.3.0-beta2 upgrade install. I suspect that specifying 'MajorUpgrade' means the GUIDs mostly don't even matter. They're there for if you try to patch so as to patch the correct files? --- wix/template.wxs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wix/template.wxs b/wix/template.wxs index 7e4409a4..a15e0fc1 100644 --- a/wix/template.wxs +++ b/wix/template.wxs @@ -104,9 +104,7 @@ - - - + @@ -115,6 +113,7 @@ + From 381c156fb9c2fa793fb91584d34c5767ab1eae6b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 11 Dec 2021 10:53:31 +0000 Subject: [PATCH 246/527] l10n: Change _Locale.preferred_languages() to use a common return var This is the first step before putting any necessary "difference between OneSky and system names for languages" translations in. --- l10n.py | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/l10n.py b/l10n.py index 7ffed54b..b1ff2672 100755 --- a/l10n.py +++ b/l10n.py @@ -309,7 +309,7 @@ class _Locale: return None - def preferred_languages(self) -> Iterable[str]: + def preferred_languages(self) -> Iterable[str]: # noqa: CCR001 """ Return a list of preferred language codes. @@ -320,34 +320,41 @@ class _Locale: :return: The preferred language list """ + languages: Iterable[str] if platform == 'darwin': - return NSLocale.preferredLanguages() + languages = NSLocale.preferredLanguages() elif platform != 'win32': # POSIX lang = locale.getlocale()[0] - return lang and [lang.replace('_', '-')] or [] + languages = lang and [lang.replace('_', '-')] or [] - def wszarray_to_list(array): - offset = 0 - while offset < len(array): - sz = ctypes.wstring_at(ctypes.addressof(array) + offset*2) - if sz: - yield sz - offset += len(sz)+1 + else: + def wszarray_to_list(array): + offset = 0 + while offset < len(array): + sz = ctypes.wstring_at(ctypes.addressof(array) + offset*2) + if sz: + yield sz + offset += len(sz)+1 - else: - break + else: + break - num = ctypes.c_ulong() - size = ctypes.c_ulong(0) - if GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, ctypes.byref(num), None, ctypes.byref(size)) and size.value: - buf = ctypes.create_unicode_buffer(size.value) + num = ctypes.c_ulong() + size = ctypes.c_ulong(0) + languages = [] + if GetUserPreferredUILanguages( + MUI_LANGUAGE_NAME, ctypes.byref(num), None, ctypes.byref(size) + ) and size.value: + buf = ctypes.create_unicode_buffer(size.value) - if GetUserPreferredUILanguages(MUI_LANGUAGE_NAME, ctypes.byref(num), ctypes.byref(buf), ctypes.byref(size)): - return wszarray_to_list(buf) + if GetUserPreferredUILanguages( + MUI_LANGUAGE_NAME, ctypes.byref(num), ctypes.byref(buf), ctypes.byref(size) + ): + languages = wszarray_to_list(buf) - return [] + return languages # singletons From 72fc78048fb7e4fefc76d0bf26eb6eb1bf95aefb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 11 Dec 2021 10:59:43 +0000 Subject: [PATCH 247/527] l10n: Change zh-CN to zh-Hans in preferred_languages(). --- l10n.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/l10n.py b/l10n.py index b1ff2672..2771f46a 100755 --- a/l10n.py +++ b/l10n.py @@ -354,6 +354,10 @@ class _Locale: ): languages = wszarray_to_list(buf) + # OneSky calls "Chinese Simplified" "zh-Hans" in the name of the file, + # but that will be zh-CN in terms of locale. So map zh-CN -> zh-Hans + languages = ['zh-Hans' if lang == 'zh-CN' else lang for lang in languages] + return languages From fc3a7b32a3d6e1d9327b5d9747973df383c1b480 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 11 Dec 2021 14:15:30 +0000 Subject: [PATCH 248/527] l10n: Make the zh-CN -> zh-Hans comment a HACK --- l10n.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/l10n.py b/l10n.py index 2771f46a..b77c07de 100755 --- a/l10n.py +++ b/l10n.py @@ -354,8 +354,9 @@ class _Locale: ): languages = wszarray_to_list(buf) - # OneSky calls "Chinese Simplified" "zh-Hans" in the name of the file, - # but that will be zh-CN in terms of locale. So map zh-CN -> zh-Hans + # HACK: | 2021-12-11: OneSky calls "Chinese Simplified" "zh-Hans" + # in the name of the file, but that will be zh-CN in terms of + # locale. So map zh-CN -> zh-Hans languages = ['zh-Hans' if lang == 'zh-CN' else lang for lang in languages] return languages From ea0fa7c77ddfce1b25a9e397af2eacf1cf4bcb0c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 13:06:09 +0000 Subject: [PATCH 249/527] develop: Bump appversion to 5.3.0-beta3 --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index ff0b7fed..14a79651 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta2' +_static_appversion = '5.3.0-beta3' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From e03809057059d1dc478ef88c75b91e92baffb8a6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 13:08:41 +0000 Subject: [PATCH 250/527] Update commodity.csv from FDevIDs version --- commodity.csv | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/commodity.csv b/commodity.csv index eb7084a3..d7af8459 100644 --- a/commodity.csv +++ b/commodity.csv @@ -189,12 +189,12 @@ id,symbol,category,name 128682053,AntimatterContainmentUnit,Salvage,Antimatter Containment Unit 128682054,SpacePioneerRelics,Salvage,Space Pioneer Relics 128682055,FossilRemnants,Salvage,Fossil Remnants -128732183,AncientRelic,Salvage,Ancient Relic -128732184,AncientOrb,Salvage,Ancient Orb -128732185,AncientCasket,Salvage,Ancient Casket -128732186,AncientTablet,Salvage,Ancient Tablet -128732187,AncientUrn,Salvage,Ancient Urn -128732188,AncientTotem,Salvage,Ancient Totem +128732183,AncientRelic,Salvage,Guardian Relic +128732184,AncientOrb,Salvage,Guardian Orb +128732185,AncientCasket,Salvage,Guardian Casket +128732186,AncientTablet,Salvage,Guardian Tablet +128732187,AncientUrn,Salvage,Guardian Urn +128732188,AncientTotem,Salvage,Guardian Totem 128737287,UnknownResin,Salvage,Thargoid Resin 128737288,UnknownBiologicalMatter,Salvage,Thargoid Biological Matter 128737289,UnknownTechnologySamples,Salvage,Thargoid Technology Samples @@ -206,8 +206,20 @@ id,symbol,category,name 128824468,ThargoidScoutTissueSample,Salvage,Thargoid Scout Tissue Sample 128888499,AncientKey,Salvage,Ancient Key 128902652,ThargoidTissueSampleType4,Salvage,Thargoid Hydra Tissue Sample -128913661,Nanomedicines,Medicines,Nanomedicines -128922524,Duradrives,Consumer Items,Duradrives +128922517,M_TissueSample_Fluid,Salvage,Mollusc Fluid +128922518,M_TissueSample_Soft,Salvage,Mollusc Soft Tissue +128922519,M_TissueSample_Nerves,Salvage,Mollusc Brain Tissue +128922520,S_TissueSample_Cells,Salvage,Pod Core Tissue +128922521,S_TissueSample_Surface,Salvage,Pod Dead Tissue +128922522,S_TissueSample_Core,Salvage,Pod Surface Tissue +128922523,P_ParticulateSample,Salvage,Anomaly Particles +128922781,S9_TissueSample_Shell,Salvage,Pod Tissue +128922782,M3_TissueSample_Membrane,Salvage,Mollusc Membrane +128922783,M3_TissueSample_Mycelium,Salvage,Mollusc Mycelium +128922784,M3_TissueSample_Spores,Salvage,Mollusc Spores +128922785,S6_TissueSample_Mesoglea,Salvage,Pod Mesoglea +128922786,S6_TissueSample_Cells,Salvage,Pod Outer Tissue +128922787,S6_TissueSample_Coenosarc,Salvage,Pod Shell Tissue 128924325,Rhodplumsite,Minerals,Rhodplumsite 128924326,Serendibite,Minerals,Serendibite 128924327,Monazite,Minerals,Monazite @@ -215,6 +227,8 @@ id,symbol,category,name 128924329,Benitoite,Minerals,Benitoite 128924330,Grandidierite,Minerals,Grandidierite 128924331,Alexandrite,Minerals,Alexandrite -128924332,Opal,Minerals,Void Opal +128924332,Opal,Minerals,Void Opals 128924333,RockforthFertiliser,Chemicals,Rockforth Fertiliser 128924334,AgronomicTreatment,Chemicals,Agronomic Treatment +128961249,Tritium,Chemicals,Tritium +128983059,OnionHeadC,Legal Drugs,Onionhead Gamma Strain From a17949aebb714b9744db4f39954af04f44933001 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 13:09:53 +0000 Subject: [PATCH 251/527] Update rare_commodity.csv to FDevIDs latest --- rare_commodity.csv | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rare_commodity.csv b/rare_commodity.csv index 67b95dbd..d8752d3f 100644 --- a/rare_commodity.csv +++ b/rare_commodity.csv @@ -126,7 +126,7 @@ id,symbol,market_id,category,name 128671119,Advert1,3227172352,Consumer Items,Ultra-Compact Processor Prototypes 128672121,TheHuttonMug,3228728832,Consumer Items,The Hutton Mug 128672122,SothisCrystallineGold,128668557,Metals,Sothis Crystalline Gold -128672316,MasterChefs,3228193280,Slavery,Master Chefs +128672316,MasterChefs,128123640,Slavery,Master Chefs 128672431,PersonalGifts,3223105792,Salvage,Personal Gifts 128672432,CrystallineSpheres,128059402,Salvage,Crystalline Spheres 128672812,OnionHeadA,3226977024,Legal Drugs,Onionhead Alpha Strain @@ -137,3 +137,6 @@ id,symbol,market_id,category,name 128748428,BuckyballBeerMats,128745551,Consumer Items,Buckyball Beer Mats 128793113,HarmaSilverSeaRum,3221575424,Legal Drugs,Harma Silver Sea Rum 128793114,PlatinumAloy,3223779840,Metals,Platinum Alloy +128913661,Nanomedicines,3226651904,Medicines,Nanomedicines +128922524,Duradrives,3223453184,Consumer Items,Duradrives +128958679,ApaVietii,128958681,Legal Drugs,Apa Vietii From dd12d97ceca99b30f234e9631264470fb09c09ce Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 13:14:17 +0000 Subject: [PATCH 252/527] Add outfitting.csv to git This is only used in collate.py and coriolis.py to check CAPI data dumps and the coriolis-data data isn't missing something, but if we want to keep it up to date, rather than ever using a random old version, best to have it in the repo. --- outfitting.csv | 1069 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1069 insertions(+) create mode 100644 outfitting.csv diff --git a/outfitting.csv b/outfitting.csv new file mode 100644 index 00000000..0b746901 --- /dev/null +++ b/outfitting.csv @@ -0,0 +1,1069 @@ +id,symbol,category,name,mount,guidance,ship,class,rating,entitlement +128049250,SideWinder_Armour_Grade1,standard,Lightweight Alloy,,,Sidewinder,1,I, +128049251,SideWinder_Armour_Grade2,standard,Reinforced Alloy,,,Sidewinder,1,I, +128049252,SideWinder_Armour_Grade3,standard,Military Grade Composite,,,Sidewinder,1,I, +128049253,SideWinder_Armour_Mirrored,standard,Mirrored Surface Composite,,,Sidewinder,1,I, +128049254,SideWinder_Armour_Reactive,standard,Reactive Surface Composite,,,Sidewinder,1,I, +128049256,Eagle_Armour_Grade1,standard,Lightweight Alloy,,,Eagle,1,I, +128049257,Eagle_Armour_Grade2,standard,Reinforced Alloy,,,Eagle,1,I, +128049258,Eagle_Armour_Grade3,standard,Military Grade Composite,,,Eagle,1,I, +128049259,Eagle_Armour_Mirrored,standard,Mirrored Surface Composite,,,Eagle,1,I, +128049260,Eagle_Armour_Reactive,standard,Reactive Surface Composite,,,Eagle,1,I, +128049262,Hauler_Armour_Grade1,standard,Lightweight Alloy,,,Hauler,1,I, +128049263,Hauler_Armour_Grade2,standard,Reinforced Alloy,,,Hauler,1,I, +128049264,Hauler_Armour_Grade3,standard,Military Grade Composite,,,Hauler,1,I, +128049265,Hauler_Armour_Mirrored,standard,Mirrored Surface Composite,,,Hauler,1,I, +128049266,Hauler_Armour_Reactive,standard,Reactive Surface Composite,,,Hauler,1,I, +128049268,Adder_Armour_Grade1,standard,Lightweight Alloy,,,Adder,1,I, +128049269,Adder_Armour_Grade2,standard,Reinforced Alloy,,,Adder,1,I, +128049270,Adder_Armour_Grade3,standard,Military Grade Composite,,,Adder,1,I, +128049271,Adder_Armour_Mirrored,standard,Mirrored Surface Composite,,,Adder,1,I, +128049272,Adder_Armour_Reactive,standard,Reactive Surface Composite,,,Adder,1,I, +128049274,Viper_Armour_Grade1,standard,Lightweight Alloy,,,Viper MkIII,1,I, +128049275,Viper_Armour_Grade2,standard,Reinforced Alloy,,,Viper MkIII,1,I, +128049276,Viper_Armour_Grade3,standard,Military Grade Composite,,,Viper MkIII,1,I, +128049277,Viper_Armour_Mirrored,standard,Mirrored Surface Composite,,,Viper MkIII,1,I, +128049278,Viper_Armour_Reactive,standard,Reactive Surface Composite,,,Viper MkIII,1,I, +128049280,CobraMkIII_Armour_Grade1,standard,Lightweight Alloy,,,Cobra MkIII,1,I, +128049281,CobraMkIII_Armour_Grade2,standard,Reinforced Alloy,,,Cobra MkIII,1,I, +128049282,CobraMkIII_Armour_Grade3,standard,Military Grade Composite,,,Cobra MkIII,1,I, +128049283,CobraMkIII_Armour_Mirrored,standard,Mirrored Surface Composite,,,Cobra MkIII,1,I, +128049284,CobraMkIII_Armour_Reactive,standard,Reactive Surface Composite,,,Cobra MkIII,1,I, +128049286,Type6_Armour_Grade1,standard,Lightweight Alloy,,,Type-6 Transporter,1,I, +128049287,Type6_Armour_Grade2,standard,Reinforced Alloy,,,Type-6 Transporter,1,I, +128049288,Type6_Armour_Grade3,standard,Military Grade Composite,,,Type-6 Transporter,1,I, +128049289,Type6_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-6 Transporter,1,I, +128049290,Type6_Armour_Reactive,standard,Reactive Surface Composite,,,Type-6 Transporter,1,I, +128049292,Dolphin_Armour_Grade1,standard,Lightweight Alloy,,,Dolphin,1,I, +128049293,Dolphin_Armour_Grade2,standard,Reinforced Alloy,,,Dolphin,1,I, +128049294,Dolphin_Armour_Grade3,standard,Military Grade Composite,,,Dolphin,1,I, +128049295,Dolphin_Armour_Mirrored,standard,Mirrored Surface Composite,,,Dolphin,1,I, +128049296,Dolphin_Armour_Reactive,standard,Reactive Surface Composite,,,Dolphin,1,I, +128049298,Type7_Armour_Grade1,standard,Lightweight Alloy,,,Type-7 Transporter,1,I, +128049299,Type7_Armour_Grade2,standard,Reinforced Alloy,,,Type-7 Transporter,1,I, +128049300,Type7_Armour_Grade3,standard,Military Grade Composite,,,Type-7 Transporter,1,I, +128049301,Type7_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-7 Transporter,1,I, +128049302,Type7_Armour_Reactive,standard,Reactive Surface Composite,,,Type-7 Transporter,1,I, +128049304,Asp_Armour_Grade1,standard,Lightweight Alloy,,,Asp Explorer,1,I, +128049305,Asp_Armour_Grade2,standard,Reinforced Alloy,,,Asp Explorer,1,I, +128049306,Asp_Armour_Grade3,standard,Military Grade Composite,,,Asp Explorer,1,I, +128049307,Asp_Armour_Mirrored,standard,Mirrored Surface Composite,,,Asp Explorer,1,I, +128049308,Asp_Armour_Reactive,standard,Reactive Surface Composite,,,Asp Explorer,1,I, +128049310,Vulture_Armour_Grade1,standard,Lightweight Alloy,,,Vulture,1,I, +128049311,Vulture_Armour_Grade2,standard,Reinforced Alloy,,,Vulture,1,I, +128049312,Vulture_Armour_Grade3,standard,Military Grade Composite,,,Vulture,1,I, +128049313,Vulture_Armour_Mirrored,standard,Mirrored Surface Composite,,,Vulture,1,I, +128049314,Vulture_Armour_Reactive,standard,Reactive Surface Composite,,,Vulture,1,I, +128049316,Empire_Trader_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Clipper,1,I, +128049317,Empire_Trader_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Clipper,1,I, +128049318,Empire_Trader_Armour_Grade3,standard,Military Grade Composite,,,Imperial Clipper,1,I, +128049319,Empire_Trader_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Clipper,1,I, +128049320,Empire_Trader_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Clipper,1,I, +128049322,Federation_Dropship_Armour_Grade1,standard,Lightweight Alloy,,,Federal Dropship,1,I, +128049323,Federation_Dropship_Armour_Grade2,standard,Reinforced Alloy,,,Federal Dropship,1,I, +128049324,Federation_Dropship_Armour_Grade3,standard,Military Grade Composite,,,Federal Dropship,1,I, +128049325,Federation_Dropship_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Dropship,1,I, +128049326,Federation_Dropship_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Dropship,1,I, +128049328,Orca_Armour_Grade1,standard,Lightweight Alloy,,,Orca,1,I, +128049329,Orca_Armour_Grade2,standard,Reinforced Alloy,,,Orca,1,I, +128049330,Orca_Armour_Grade3,standard,Military Grade Composite,,,Orca,1,I, +128049331,Orca_Armour_Mirrored,standard,Mirrored Surface Composite,,,Orca,1,I, +128049332,Orca_Armour_Reactive,standard,Reactive Surface Composite,,,Orca,1,I, +128049334,Type9_Armour_Grade1,standard,Lightweight Alloy,,,Type-9 Heavy,1,I, +128049335,Type9_Armour_Grade2,standard,Reinforced Alloy,,,Type-9 Heavy,1,I, +128049336,Type9_Armour_Grade3,standard,Military Grade Composite,,,Type-9 Heavy,1,I, +128049337,Type9_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-9 Heavy,1,I, +128049338,Type9_Armour_Reactive,standard,Reactive Surface Composite,,,Type-9 Heavy,1,I, +128049340,Python_Armour_Grade1,standard,Lightweight Alloy,,,Python,1,I, +128049341,Python_Armour_Grade2,standard,Reinforced Alloy,,,Python,1,I, +128049342,Python_Armour_Grade3,standard,Military Grade Composite,,,Python,1,I, +128049343,Python_Armour_Mirrored,standard,Mirrored Surface Composite,,,Python,1,I, +128049344,Python_Armour_Reactive,standard,Reactive Surface Composite,,,Python,1,I, +128049346,BelugaLiner_Armour_Grade1,standard,Lightweight Alloy,,,Beluga Liner,1,I, +128049347,BelugaLiner_Armour_Grade2,standard,Reinforced Alloy,,,Beluga Liner,1,I, +128049348,BelugaLiner_Armour_Grade3,standard,Military Grade Composite,,,Beluga Liner,1,I, +128049349,BelugaLiner_Armour_Mirrored,standard,Mirrored Surface Composite,,,Beluga Liner,1,I, +128049350,BelugaLiner_Armour_Reactive,standard,Reactive Surface Composite,,,Beluga Liner,1,I, +128049352,FerDeLance_Armour_Grade1,standard,Lightweight Alloy,,,Fer-de-Lance,1,I, +128049353,FerDeLance_Armour_Grade2,standard,Reinforced Alloy,,,Fer-de-Lance,1,I, +128049354,FerDeLance_Armour_Grade3,standard,Military Grade Composite,,,Fer-de-Lance,1,I, +128049355,FerDeLance_Armour_Mirrored,standard,Mirrored Surface Composite,,,Fer-de-Lance,1,I, +128049356,FerDeLance_Armour_Reactive,standard,Reactive Surface Composite,,,Fer-de-Lance,1,I, +128049364,Anaconda_Armour_Grade1,standard,Lightweight Alloy,,,Anaconda,1,I, +128049365,Anaconda_Armour_Grade2,standard,Reinforced Alloy,,,Anaconda,1,I, +128049366,Anaconda_Armour_Grade3,standard,Military Grade Composite,,,Anaconda,1,I, +128049367,Anaconda_Armour_Mirrored,standard,Mirrored Surface Composite,,,Anaconda,1,I, +128049368,Anaconda_Armour_Reactive,standard,Reactive Surface Composite,,,Anaconda,1,I, +128049370,Federation_Corvette_Armour_Grade1,standard,Lightweight Alloy,,,Federal Corvette,1,I, +128049371,Federation_Corvette_Armour_Grade2,standard,Reinforced Alloy,,,Federal Corvette,1,I, +128049372,Federation_Corvette_Armour_Grade3,standard,Military Grade Composite,,,Federal Corvette,1,I, +128049373,Federation_Corvette_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Corvette,1,I, +128049374,Federation_Corvette_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Corvette,1,I, +128049376,Cutter_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Cutter,1,I, +128049377,Cutter_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Cutter,1,I, +128049378,Cutter_Armour_Grade3,standard,Military Grade Composite,,,Imperial Cutter,1,I, +128049379,Cutter_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Cutter,1,I, +128049380,Cutter_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Cutter,1,I, +128049381,Hpt_PulseLaser_Fixed_Small,hardpoint,Pulse Laser,Fixed,,,1,F, +128049382,Hpt_PulseLaser_Fixed_Medium,hardpoint,Pulse Laser,Fixed,,,2,E, +128049383,Hpt_PulseLaser_Fixed_Large,hardpoint,Pulse Laser,Fixed,,,3,D, +128049384,Hpt_PulseLaser_Fixed_Huge,hardpoint,Pulse Laser,Fixed,,,4,A, +128049385,Hpt_PulseLaser_Gimbal_Small,hardpoint,Pulse Laser,Gimballed,,,1,G, +128049386,Hpt_PulseLaser_Gimbal_Medium,hardpoint,Pulse Laser,Gimballed,,,2,F, +128049387,Hpt_PulseLaser_Gimbal_Large,hardpoint,Pulse Laser,Gimballed,,,3,E, +128049388,Hpt_PulseLaser_Turret_Small,hardpoint,Pulse Laser,Turreted,,,1,G, +128049389,Hpt_PulseLaser_Turret_Medium,hardpoint,Pulse Laser,Turreted,,,2,F, +128049390,Hpt_PulseLaser_Turret_Large,hardpoint,Pulse Laser,Turreted,,,3,F, +128049400,Hpt_PulseLaserBurst_Fixed_Small,hardpoint,Burst Laser,Fixed,,,1,F, +128049401,Hpt_PulseLaserBurst_Fixed_Medium,hardpoint,Burst Laser,Fixed,,,2,E, +128049402,Hpt_PulseLaserBurst_Fixed_Large,hardpoint,Burst Laser,Fixed,,,3,D, +128049403,Hpt_PulseLaserBurst_Fixed_Huge,hardpoint,Burst Laser,Fixed,,,4,E, +128049404,Hpt_PulseLaserBurst_Gimbal_Small,hardpoint,Burst Laser,Gimballed,,,1,G, +128049405,Hpt_PulseLaserBurst_Gimbal_Medium,hardpoint,Burst Laser,Gimballed,,,2,F, +128049406,Hpt_PulseLaserBurst_Gimbal_Large,hardpoint,Burst Laser,Gimballed,,,3,E, +128049407,Hpt_PulseLaserBurst_Turret_Small,hardpoint,Burst Laser,Turreted,,,1,G, +128049408,Hpt_PulseLaserBurst_Turret_Medium,hardpoint,Burst Laser,Turreted,,,2,F, +128049409,Hpt_PulseLaserBurst_Turret_Large,hardpoint,Burst Laser,Turreted,,,3,E, +128049428,Hpt_BeamLaser_Fixed_Small,hardpoint,Beam Laser,Fixed,,,1,E, +128049429,Hpt_BeamLaser_Fixed_Medium,hardpoint,Beam Laser,Fixed,,,2,D, +128049430,Hpt_BeamLaser_Fixed_Large,hardpoint,Beam Laser,Fixed,,,3,C, +128049431,Hpt_BeamLaser_Fixed_Huge,hardpoint,Beam Laser,Fixed,,,4,A, +128049432,Hpt_BeamLaser_Gimbal_Small,hardpoint,Beam Laser,Gimballed,,,1,E, +128049433,Hpt_BeamLaser_Gimbal_Medium,hardpoint,Beam Laser,Gimballed,,,2,D, +128049434,Hpt_BeamLaser_Gimbal_Large,hardpoint,Beam Laser,Gimballed,,,3,C, +128049435,Hpt_BeamLaser_Turret_Small,hardpoint,Beam Laser,Turreted,,,1,F, +128049436,Hpt_BeamLaser_Turret_Medium,hardpoint,Beam Laser,Turreted,,,2,E, +128049437,Hpt_BeamLaser_Turret_Large,hardpoint,Beam Laser,Turreted,,,3,D, +128049438,Hpt_Cannon_Fixed_Small,hardpoint,Cannon,Fixed,,,1,D, +128049439,Hpt_Cannon_Fixed_Medium,hardpoint,Cannon,Fixed,,,2,D, +128049440,Hpt_Cannon_Fixed_Large,hardpoint,Cannon,Fixed,,,3,C, +128049441,Hpt_Cannon_Fixed_Huge,hardpoint,Cannon,Fixed,,,4,B, +128049442,Hpt_Cannon_Gimbal_Small,hardpoint,Cannon,Gimballed,,,1,E, +128049443,Hpt_Cannon_Gimbal_Medium,hardpoint,Cannon,Gimballed,,,2,D, +128049444,Hpt_Cannon_Gimbal_Huge,hardpoint,Cannon,Gimballed,,,4,B, +128049445,Hpt_Cannon_Turret_Small,hardpoint,Cannon,Turreted,,,1,F, +128049446,Hpt_Cannon_Turret_Medium,hardpoint,Cannon,Turreted,,,2,E, +128049447,Hpt_Cannon_Turret_Large,hardpoint,Cannon,Turreted,,,3,D, +128049448,Hpt_Slugshot_Fixed_Small,hardpoint,Fragment Cannon,Fixed,,,1,E, +128049449,Hpt_Slugshot_Fixed_Medium,hardpoint,Fragment Cannon,Fixed,,,2,A, +128049450,Hpt_Slugshot_Fixed_Large,hardpoint,Fragment Cannon,Fixed,,,3,C, +128049451,Hpt_Slugshot_Gimbal_Small,hardpoint,Fragment Cannon,Gimballed,,,1,E, +128049452,Hpt_Slugshot_Gimbal_Medium,hardpoint,Fragment Cannon,Gimballed,,,2,D, +128049453,Hpt_Slugshot_Turret_Small,hardpoint,Fragment Cannon,Turreted,,,1,E, +128049454,Hpt_Slugshot_Turret_Medium,hardpoint,Fragment Cannon,Turreted,,,2,D, +128049455,Hpt_MultiCannon_Fixed_Small,hardpoint,Multi-Cannon,Fixed,,,1,F, +128049456,Hpt_MultiCannon_Fixed_Medium,hardpoint,Multi-Cannon,Fixed,,,2,E, +128049457,Hpt_MultiCannon_Fixed_Large,hardpoint,Multi-Cannon,Fixed,,,3,C, +128049458,Hpt_MultiCannon_Fixed_Huge,hardpoint,Multi-Cannon,Fixed,,,4,A, +128049459,Hpt_MultiCannon_Gimbal_Small,hardpoint,Multi-Cannon,Gimballed,,,1,G, +128049460,Hpt_MultiCannon_Gimbal_Medium,hardpoint,Multi-Cannon,Gimballed,,,2,F, +128049461,Hpt_MultiCannon_Gimbal_Large,hardpoint,Multi-Cannon,Gimballed,,,3,C, +128049462,Hpt_MultiCannon_Turret_Small,hardpoint,Multi-Cannon,Turreted,,,1,G, +128049463,Hpt_MultiCannon_Turret_Medium,hardpoint,Multi-Cannon,Turreted,,,2,F, +128049464,Hpt_MultiCannon_Turret_Large,hardpoint,Multi-Cannon,Turreted,,,3,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128049465,Hpt_PlasmaAccelerator_Fixed_Medium,hardpoint,Plasma Accelerator,Fixed,,,2,C, +128049466,Hpt_PlasmaAccelerator_Fixed_Large,hardpoint,Plasma Accelerator,Fixed,,,3,B, +128049467,Hpt_PlasmaAccelerator_Fixed_Huge,hardpoint,Plasma Accelerator,Fixed,,,4,A, +128049488,Hpt_Railgun_Fixed_Small,hardpoint,Rail Gun,Fixed,,,1,D, +128049489,Hpt_Railgun_Fixed_Medium,hardpoint,Rail Gun,Fixed,,,2,B, +128049492,Hpt_BasicMissileRack_Fixed_Small,hardpoint,Seeker Missile Rack,Fixed,Seeker,,1,B, +128049493,Hpt_BasicMissileRack_Fixed_Medium,hardpoint,Seeker Missile Rack,Fixed,Seeker,,2,B, +128049494,Hpt_BasicMissileRack_Fixed_Large,hardpoint,Seeker Missile Rack,Fixed,Seeker,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128049500,Hpt_MineLauncher_Fixed_Small,hardpoint,Mine Launcher,Fixed,,,1,I, +128049501,Hpt_MineLauncher_Fixed_Medium,hardpoint,Mine Launcher,Fixed,,,2,I, +128049509,Hpt_AdvancedTorpPylon_Fixed_Small,hardpoint,Torpedo Pylon,Fixed,Seeker,,1,I, +128049510,Hpt_AdvancedTorpPylon_Fixed_Medium,hardpoint,Torpedo Pylon,Fixed,Seeker,,2,I, +128049511,Hpt_AdvancedTorpPylon_Fixed_Large,hardpoint,Torpedo Pylon,Fixed,Seeker,,3,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128049513,Hpt_ChaffLauncher_Tiny,utility,Chaff Launcher,,,,0,I, +128049516,Hpt_ElectronicCountermeasure_Tiny,utility,Electronic Countermeasure,,,,0,F, +128049519,Hpt_HeatSinkLauncher_Turret_Tiny,utility,Heat Sink Launcher,,,,0,I, +128049522,Hpt_PlasmaPointDefence_Turret_Tiny,utility,Point Defence,,,,0,I, +128049525,Hpt_MiningLaser_Fixed_Small,hardpoint,Mining Laser,Fixed,,,1,D, +128049526,Hpt_MiningLaser_Fixed_Medium,hardpoint,Mining Laser,Fixed,,,2,D, +128049549,Int_DockingComputer_Standard,internal,Standard Docking Computer,,,,1,E, +128064033,Int_Powerplant_Size2_Class1,standard,Power Plant,,,,2,E, +128064034,Int_Powerplant_Size2_Class2,standard,Power Plant,,,,2,D, +128064035,Int_Powerplant_Size2_Class3,standard,Power Plant,,,,2,C, +128064036,Int_Powerplant_Size2_Class4,standard,Power Plant,,,,2,B, +128064037,Int_Powerplant_Size2_Class5,standard,Power Plant,,,,2,A, +128064038,Int_Powerplant_Size3_Class1,standard,Power Plant,,,,3,E, +128064039,Int_Powerplant_Size3_Class2,standard,Power Plant,,,,3,D, +128064040,Int_Powerplant_Size3_Class3,standard,Power Plant,,,,3,C, +128064041,Int_Powerplant_Size3_Class4,standard,Power Plant,,,,3,B, +128064042,Int_Powerplant_Size3_Class5,standard,Power Plant,,,,3,A, +128064043,Int_Powerplant_Size4_Class1,standard,Power Plant,,,,4,E, +128064044,Int_Powerplant_Size4_Class2,standard,Power Plant,,,,4,D, +128064045,Int_Powerplant_Size4_Class3,standard,Power Plant,,,,4,C, +128064046,Int_Powerplant_Size4_Class4,standard,Power Plant,,,,4,B, +128064047,Int_Powerplant_Size4_Class5,standard,Power Plant,,,,4,A, +128064048,Int_Powerplant_Size5_Class1,standard,Power Plant,,,,5,E, +128064049,Int_Powerplant_Size5_Class2,standard,Power Plant,,,,5,D, +128064050,Int_Powerplant_Size5_Class3,standard,Power Plant,,,,5,C, +128064051,Int_Powerplant_Size5_Class4,standard,Power Plant,,,,5,B, +128064052,Int_Powerplant_Size5_Class5,standard,Power Plant,,,,5,A, +128064053,Int_Powerplant_Size6_Class1,standard,Power Plant,,,,6,E, +128064054,Int_Powerplant_Size6_Class2,standard,Power Plant,,,,6,D, +128064055,Int_Powerplant_Size6_Class3,standard,Power Plant,,,,6,C, +128064056,Int_Powerplant_Size6_Class4,standard,Power Plant,,,,6,B, +128064057,Int_Powerplant_Size6_Class5,standard,Power Plant,,,,6,A, +128064058,Int_Powerplant_Size7_Class1,standard,Power Plant,,,,7,E, +128064059,Int_Powerplant_Size7_Class2,standard,Power Plant,,,,7,D, +128064060,Int_Powerplant_Size7_Class3,standard,Power Plant,,,,7,C, +128064061,Int_Powerplant_Size7_Class4,standard,Power Plant,,,,7,B, +128064062,Int_Powerplant_Size7_Class5,standard,Power Plant,,,,7,A, +128064063,Int_Powerplant_Size8_Class1,standard,Power Plant,,,,8,E, +128064064,Int_Powerplant_Size8_Class2,standard,Power Plant,,,,8,D, +128064065,Int_Powerplant_Size8_Class3,standard,Power Plant,,,,8,C, +128064066,Int_Powerplant_Size8_Class4,standard,Power Plant,,,,8,B, +128064067,Int_Powerplant_Size8_Class5,standard,Power Plant,,,,8,A, +128064068,Int_Engine_Size2_Class1,standard,Thrusters,,,,2,E, +128064069,Int_Engine_Size2_Class2,standard,Thrusters,,,,2,D, +128064070,Int_Engine_Size2_Class3,standard,Thrusters,,,,2,C, +128064071,Int_Engine_Size2_Class4,standard,Thrusters,,,,2,B, +128064072,Int_Engine_Size2_Class5,standard,Thrusters,,,,2,A, +128064073,Int_Engine_Size3_Class1,standard,Thrusters,,,,3,E, +128064074,Int_Engine_Size3_Class2,standard,Thrusters,,,,3,D, +128064075,Int_Engine_Size3_Class3,standard,Thrusters,,,,3,C, +128064076,Int_Engine_Size3_Class4,standard,Thrusters,,,,3,B, +128064077,Int_Engine_Size3_Class5,standard,Thrusters,,,,3,A, +128064078,Int_Engine_Size4_Class1,standard,Thrusters,,,,4,E, +128064079,Int_Engine_Size4_Class2,standard,Thrusters,,,,4,D, +128064080,Int_Engine_Size4_Class3,standard,Thrusters,,,,4,C, +128064081,Int_Engine_Size4_Class4,standard,Thrusters,,,,4,B, +128064082,Int_Engine_Size4_Class5,standard,Thrusters,,,,4,A, +128064083,Int_Engine_Size5_Class1,standard,Thrusters,,,,5,E, +128064084,Int_Engine_Size5_Class2,standard,Thrusters,,,,5,D, +128064085,Int_Engine_Size5_Class3,standard,Thrusters,,,,5,C, +128064086,Int_Engine_Size5_Class4,standard,Thrusters,,,,5,B, +128064087,Int_Engine_Size5_Class5,standard,Thrusters,,,,5,A, +128064088,Int_Engine_Size6_Class1,standard,Thrusters,,,,6,E, +128064089,Int_Engine_Size6_Class2,standard,Thrusters,,,,6,D, +128064090,Int_Engine_Size6_Class3,standard,Thrusters,,,,6,C, +128064091,Int_Engine_Size6_Class4,standard,Thrusters,,,,6,B, +128064092,Int_Engine_Size6_Class5,standard,Thrusters,,,,6,A, +128064093,Int_Engine_Size7_Class1,standard,Thrusters,,,,7,E, +128064094,Int_Engine_Size7_Class2,standard,Thrusters,,,,7,D, +128064095,Int_Engine_Size7_Class3,standard,Thrusters,,,,7,C, +128064096,Int_Engine_Size7_Class4,standard,Thrusters,,,,7,B, +128064097,Int_Engine_Size7_Class5,standard,Thrusters,,,,7,A, +128064098,Int_Engine_Size8_Class1,standard,Thrusters,,,,8,E, +128064099,Int_Engine_Size8_Class2,standard,Thrusters,,,,8,D, +128064100,Int_Engine_Size8_Class3,standard,Thrusters,,,,8,C, +128064101,Int_Engine_Size8_Class4,standard,Thrusters,,,,8,B, +128064102,Int_Engine_Size8_Class5,standard,Thrusters,,,,8,A, +128064103,Int_Hyperdrive_Size2_Class1,standard,Frame Shift Drive,,,,2,E, +128064104,Int_Hyperdrive_Size2_Class2,standard,Frame Shift Drive,,,,2,D, +128064105,Int_Hyperdrive_Size2_Class3,standard,Frame Shift Drive,,,,2,C, +128064106,Int_Hyperdrive_Size2_Class4,standard,Frame Shift Drive,,,,2,B, +128064107,Int_Hyperdrive_Size2_Class5,standard,Frame Shift Drive,,,,2,A, +128064108,Int_Hyperdrive_Size3_Class1,standard,Frame Shift Drive,,,,3,E, +128064109,Int_Hyperdrive_Size3_Class2,standard,Frame Shift Drive,,,,3,D, +128064110,Int_Hyperdrive_Size3_Class3,standard,Frame Shift Drive,,,,3,C, +128064111,Int_Hyperdrive_Size3_Class4,standard,Frame Shift Drive,,,,3,B, +128064112,Int_Hyperdrive_Size3_Class5,standard,Frame Shift Drive,,,,3,A, +128064113,Int_Hyperdrive_Size4_Class1,standard,Frame Shift Drive,,,,4,E, +128064114,Int_Hyperdrive_Size4_Class2,standard,Frame Shift Drive,,,,4,D, +128064115,Int_Hyperdrive_Size4_Class3,standard,Frame Shift Drive,,,,4,C, +128064116,Int_Hyperdrive_Size4_Class4,standard,Frame Shift Drive,,,,4,B, +128064117,Int_Hyperdrive_Size4_Class5,standard,Frame Shift Drive,,,,4,A, +128064118,Int_Hyperdrive_Size5_Class1,standard,Frame Shift Drive,,,,5,E, +128064119,Int_Hyperdrive_Size5_Class2,standard,Frame Shift Drive,,,,5,D, +128064120,Int_Hyperdrive_Size5_Class3,standard,Frame Shift Drive,,,,5,C, +128064121,Int_Hyperdrive_Size5_Class4,standard,Frame Shift Drive,,,,5,B, +128064122,Int_Hyperdrive_Size5_Class5,standard,Frame Shift Drive,,,,5,A, +128064123,Int_Hyperdrive_Size6_Class1,standard,Frame Shift Drive,,,,6,E, +128064124,Int_Hyperdrive_Size6_Class2,standard,Frame Shift Drive,,,,6,D, +128064125,Int_Hyperdrive_Size6_Class3,standard,Frame Shift Drive,,,,6,C, +128064126,Int_Hyperdrive_Size6_Class4,standard,Frame Shift Drive,,,,6,B, +128064127,Int_Hyperdrive_Size6_Class5,standard,Frame Shift Drive,,,,6,A, +128064128,Int_Hyperdrive_Size7_Class1,standard,Frame Shift Drive,,,,7,E, +128064129,Int_Hyperdrive_Size7_Class2,standard,Frame Shift Drive,,,,7,D, +128064130,Int_Hyperdrive_Size7_Class3,standard,Frame Shift Drive,,,,7,C, +128064131,Int_Hyperdrive_Size7_Class4,standard,Frame Shift Drive,,,,7,B, +128064132,Int_Hyperdrive_Size7_Class5,standard,Frame Shift Drive,,,,7,A, +128064133,Int_Hyperdrive_Size8_Class1,standard,Frame Shift Drive,,,,8,E, +128064134,Int_Hyperdrive_Size8_Class2,standard,Frame Shift Drive,,,,8,D, +128064135,Int_Hyperdrive_Size8_Class3,standard,Frame Shift Drive,,,,8,C, +128064136,Int_Hyperdrive_Size8_Class4,standard,Frame Shift Drive,,,,8,B, +128064137,Int_Hyperdrive_Size8_Class5,standard,Frame Shift Drive,,,,8,A, +128064138,Int_LifeSupport_Size1_Class1,standard,Life Support,,,,1,E, +128064139,Int_LifeSupport_Size1_Class2,standard,Life Support,,,,1,D, +128064140,Int_LifeSupport_Size1_Class3,standard,Life Support,,,,1,C, +128064141,Int_LifeSupport_Size1_Class4,standard,Life Support,,,,1,B, +128064142,Int_LifeSupport_Size1_Class5,standard,Life Support,,,,1,A, +128064143,Int_LifeSupport_Size2_Class1,standard,Life Support,,,,2,E, +128064144,Int_LifeSupport_Size2_Class2,standard,Life Support,,,,2,D, +128064145,Int_LifeSupport_Size2_Class3,standard,Life Support,,,,2,C, +128064146,Int_LifeSupport_Size2_Class4,standard,Life Support,,,,2,B, +128064147,Int_LifeSupport_Size2_Class5,standard,Life Support,,,,2,A, +128064148,Int_LifeSupport_Size3_Class1,standard,Life Support,,,,3,E, +128064149,Int_LifeSupport_Size3_Class2,standard,Life Support,,,,3,D, +128064150,Int_LifeSupport_Size3_Class3,standard,Life Support,,,,3,C, +128064151,Int_LifeSupport_Size3_Class4,standard,Life Support,,,,3,B, +128064152,Int_LifeSupport_Size3_Class5,standard,Life Support,,,,3,A, +128064153,Int_LifeSupport_Size4_Class1,standard,Life Support,,,,4,E, +128064154,Int_LifeSupport_Size4_Class2,standard,Life Support,,,,4,D, +128064155,Int_LifeSupport_Size4_Class3,standard,Life Support,,,,4,C, +128064156,Int_LifeSupport_Size4_Class4,standard,Life Support,,,,4,B, +128064157,Int_LifeSupport_Size4_Class5,standard,Life Support,,,,4,A, +128064158,Int_LifeSupport_Size5_Class1,standard,Life Support,,,,5,E, +128064159,Int_LifeSupport_Size5_Class2,standard,Life Support,,,,5,D, +128064160,Int_LifeSupport_Size5_Class3,standard,Life Support,,,,5,C, +128064161,Int_LifeSupport_Size5_Class4,standard,Life Support,,,,5,B, +128064162,Int_LifeSupport_Size5_Class5,standard,Life Support,,,,5,A, +128064163,Int_LifeSupport_Size6_Class1,standard,Life Support,,,,6,E, +128064164,Int_LifeSupport_Size6_Class2,standard,Life Support,,,,6,D, +128064165,Int_LifeSupport_Size6_Class3,standard,Life Support,,,,6,C, +128064166,Int_LifeSupport_Size6_Class4,standard,Life Support,,,,6,B, +128064167,Int_LifeSupport_Size6_Class5,standard,Life Support,,,,6,A, +128064168,Int_LifeSupport_Size7_Class1,standard,Life Support,,,,7,E, +128064169,Int_LifeSupport_Size7_Class2,standard,Life Support,,,,7,D, +128064170,Int_LifeSupport_Size7_Class3,standard,Life Support,,,,7,C, +128064171,Int_LifeSupport_Size7_Class4,standard,Life Support,,,,7,B, +128064172,Int_LifeSupport_Size7_Class5,standard,Life Support,,,,7,A, +128064173,Int_LifeSupport_Size8_Class1,standard,Life Support,,,,8,E, +128064174,Int_LifeSupport_Size8_Class2,standard,Life Support,,,,8,D, +128064175,Int_LifeSupport_Size8_Class3,standard,Life Support,,,,8,C, +128064176,Int_LifeSupport_Size8_Class4,standard,Life Support,,,,8,B, +128064177,Int_LifeSupport_Size8_Class5,standard,Life Support,,,,8,A, +128064178,Int_PowerDistributor_Size1_Class1,standard,Power Distributor,,,,1,E, +128064179,Int_PowerDistributor_Size1_Class2,standard,Power Distributor,,,,1,D, +128064180,Int_PowerDistributor_Size1_Class3,standard,Power Distributor,,,,1,C, +128064181,Int_PowerDistributor_Size1_Class4,standard,Power Distributor,,,,1,B, +128064182,Int_PowerDistributor_Size1_Class5,standard,Power Distributor,,,,1,A, +128064183,Int_PowerDistributor_Size2_Class1,standard,Power Distributor,,,,2,E, +128064184,Int_PowerDistributor_Size2_Class2,standard,Power Distributor,,,,2,D, +128064185,Int_PowerDistributor_Size2_Class3,standard,Power Distributor,,,,2,C, +128064186,Int_PowerDistributor_Size2_Class4,standard,Power Distributor,,,,2,B, +128064187,Int_PowerDistributor_Size2_Class5,standard,Power Distributor,,,,2,A, +128064188,Int_PowerDistributor_Size3_Class1,standard,Power Distributor,,,,3,E, +128064189,Int_PowerDistributor_Size3_Class2,standard,Power Distributor,,,,3,D, +128064190,Int_PowerDistributor_Size3_Class3,standard,Power Distributor,,,,3,C, +128064191,Int_PowerDistributor_Size3_Class4,standard,Power Distributor,,,,3,B, +128064192,Int_PowerDistributor_Size3_Class5,standard,Power Distributor,,,,3,A, +128064193,Int_PowerDistributor_Size4_Class1,standard,Power Distributor,,,,4,E, +128064194,Int_PowerDistributor_Size4_Class2,standard,Power Distributor,,,,4,D, +128064195,Int_PowerDistributor_Size4_Class3,standard,Power Distributor,,,,4,C, +128064196,Int_PowerDistributor_Size4_Class4,standard,Power Distributor,,,,4,B, +128064197,Int_PowerDistributor_Size4_Class5,standard,Power Distributor,,,,4,A, +128064198,Int_PowerDistributor_Size5_Class1,standard,Power Distributor,,,,5,E, +128064199,Int_PowerDistributor_Size5_Class2,standard,Power Distributor,,,,5,D, +128064200,Int_PowerDistributor_Size5_Class3,standard,Power Distributor,,,,5,C, +128064201,Int_PowerDistributor_Size5_Class4,standard,Power Distributor,,,,5,B, +128064202,Int_PowerDistributor_Size5_Class5,standard,Power Distributor,,,,5,A, +128064203,Int_PowerDistributor_Size6_Class1,standard,Power Distributor,,,,6,E, +128064204,Int_PowerDistributor_Size6_Class2,standard,Power Distributor,,,,6,D, +128064205,Int_PowerDistributor_Size6_Class3,standard,Power Distributor,,,,6,C, +128064206,Int_PowerDistributor_Size6_Class4,standard,Power Distributor,,,,6,B, +128064207,Int_PowerDistributor_Size6_Class5,standard,Power Distributor,,,,6,A, +128064208,Int_PowerDistributor_Size7_Class1,standard,Power Distributor,,,,7,E, +128064209,Int_PowerDistributor_Size7_Class2,standard,Power Distributor,,,,7,D, +128064210,Int_PowerDistributor_Size7_Class3,standard,Power Distributor,,,,7,C, +128064211,Int_PowerDistributor_Size7_Class4,standard,Power Distributor,,,,7,B, +128064212,Int_PowerDistributor_Size7_Class5,standard,Power Distributor,,,,7,A, +128064213,Int_PowerDistributor_Size8_Class1,standard,Power Distributor,,,,8,E, +128064214,Int_PowerDistributor_Size8_Class2,standard,Power Distributor,,,,8,D, +128064215,Int_PowerDistributor_Size8_Class3,standard,Power Distributor,,,,8,C, +128064216,Int_PowerDistributor_Size8_Class4,standard,Power Distributor,,,,8,B, +128064217,Int_PowerDistributor_Size8_Class5,standard,Power Distributor,,,,8,A, +128064218,Int_Sensors_Size1_Class1,standard,Sensors,,,,1,E, +128064219,Int_Sensors_Size1_Class2,standard,Sensors,,,,1,D, +128064220,Int_Sensors_Size1_Class3,standard,Sensors,,,,1,C, +128064221,Int_Sensors_Size1_Class4,standard,Sensors,,,,1,B, +128064222,Int_Sensors_Size1_Class5,standard,Sensors,,,,1,A, +128064223,Int_Sensors_Size2_Class1,standard,Sensors,,,,2,E, +128064224,Int_Sensors_Size2_Class2,standard,Sensors,,,,2,D, +128064225,Int_Sensors_Size2_Class3,standard,Sensors,,,,2,C, +128064226,Int_Sensors_Size2_Class4,standard,Sensors,,,,2,B, +128064227,Int_Sensors_Size2_Class5,standard,Sensors,,,,2,A, +128064228,Int_Sensors_Size3_Class1,standard,Sensors,,,,3,E, +128064229,Int_Sensors_Size3_Class2,standard,Sensors,,,,3,D, +128064230,Int_Sensors_Size3_Class3,standard,Sensors,,,,3,C, +128064231,Int_Sensors_Size3_Class4,standard,Sensors,,,,3,B, +128064232,Int_Sensors_Size3_Class5,standard,Sensors,,,,3,A, +128064233,Int_Sensors_Size4_Class1,standard,Sensors,,,,4,E, +128064234,Int_Sensors_Size4_Class2,standard,Sensors,,,,4,D, +128064235,Int_Sensors_Size4_Class3,standard,Sensors,,,,4,C, +128064236,Int_Sensors_Size4_Class4,standard,Sensors,,,,4,B, +128064237,Int_Sensors_Size4_Class5,standard,Sensors,,,,4,A, +128064238,Int_Sensors_Size5_Class1,standard,Sensors,,,,5,E, +128064239,Int_Sensors_Size5_Class2,standard,Sensors,,,,5,D, +128064240,Int_Sensors_Size5_Class3,standard,Sensors,,,,5,C, +128064241,Int_Sensors_Size5_Class4,standard,Sensors,,,,5,B, +128064242,Int_Sensors_Size5_Class5,standard,Sensors,,,,5,A, +128064243,Int_Sensors_Size6_Class1,standard,Sensors,,,,6,E, +128064244,Int_Sensors_Size6_Class2,standard,Sensors,,,,6,D, +128064245,Int_Sensors_Size6_Class3,standard,Sensors,,,,6,C, +128064246,Int_Sensors_Size6_Class4,standard,Sensors,,,,6,B, +128064247,Int_Sensors_Size6_Class5,standard,Sensors,,,,6,A, +128064248,Int_Sensors_Size7_Class1,standard,Sensors,,,,7,E, +128064249,Int_Sensors_Size7_Class2,standard,Sensors,,,,7,D, +128064250,Int_Sensors_Size7_Class3,standard,Sensors,,,,7,C, +128064251,Int_Sensors_Size7_Class4,standard,Sensors,,,,7,B, +128064252,Int_Sensors_Size7_Class5,standard,Sensors,,,,7,A, +128064253,Int_Sensors_Size8_Class1,standard,Sensors,,,,8,E, +128064254,Int_Sensors_Size8_Class2,standard,Sensors,,,,8,D, +128064255,Int_Sensors_Size8_Class3,standard,Sensors,,,,8,C, +128064256,Int_Sensors_Size8_Class4,standard,Sensors,,,,8,B, +128064257,Int_Sensors_Size8_Class5,standard,Sensors,,,,8,A, +128064258,Int_ShieldGenerator_Size1_Class1,internal,Shield Generator,,,,1,E, +128064259,Int_ShieldGenerator_Size1_Class2,internal,Shield Generator,,,,1,D, +128064260,Int_ShieldGenerator_Size1_Class3,internal,Shield Generator,,,,1,C, +128064262,Int_ShieldGenerator_Size1_Class5,internal,Shield Generator,,,,1,A, +128064263,Int_ShieldGenerator_Size2_Class1,internal,Shield Generator,,,,2,E, +128064264,Int_ShieldGenerator_Size2_Class2,internal,Shield Generator,,,,2,D, +128064265,Int_ShieldGenerator_Size2_Class3,internal,Shield Generator,,,,2,C, +128064266,Int_ShieldGenerator_Size2_Class4,internal,Shield Generator,,,,2,B, +128064267,Int_ShieldGenerator_Size2_Class5,internal,Shield Generator,,,,2,A, +128064268,Int_ShieldGenerator_Size3_Class1,internal,Shield Generator,,,,3,E, +128064269,Int_ShieldGenerator_Size3_Class2,internal,Shield Generator,,,,3,D, +128064270,Int_ShieldGenerator_Size3_Class3,internal,Shield Generator,,,,3,C, +128064271,Int_ShieldGenerator_Size3_Class4,internal,Shield Generator,,,,3,B, +128064272,Int_ShieldGenerator_Size3_Class5,internal,Shield Generator,,,,3,A, +128064273,Int_ShieldGenerator_Size4_Class1,internal,Shield Generator,,,,4,E, +128064274,Int_ShieldGenerator_Size4_Class2,internal,Shield Generator,,,,4,D, +128064275,Int_ShieldGenerator_Size4_Class3,internal,Shield Generator,,,,4,C, +128064276,Int_ShieldGenerator_Size4_Class4,internal,Shield Generator,,,,4,B, +128064277,Int_ShieldGenerator_Size4_Class5,internal,Shield Generator,,,,4,A, +128064278,Int_ShieldGenerator_Size5_Class1,internal,Shield Generator,,,,5,E, +128064279,Int_ShieldGenerator_Size5_Class2,internal,Shield Generator,,,,5,D, +128064280,Int_ShieldGenerator_Size5_Class3,internal,Shield Generator,,,,5,C, +128064281,Int_ShieldGenerator_Size5_Class4,internal,Shield Generator,,,,5,B, +128064282,Int_ShieldGenerator_Size5_Class5,internal,Shield Generator,,,,5,A, +128064283,Int_ShieldGenerator_Size6_Class1,internal,Shield Generator,,,,6,E, +128064284,Int_ShieldGenerator_Size6_Class2,internal,Shield Generator,,,,6,D, +128064285,Int_ShieldGenerator_Size6_Class3,internal,Shield Generator,,,,6,C, +128064286,Int_ShieldGenerator_Size6_Class4,internal,Shield Generator,,,,6,B, +128064287,Int_ShieldGenerator_Size6_Class5,internal,Shield Generator,,,,6,A, +128064288,Int_ShieldGenerator_Size7_Class1,internal,Shield Generator,,,,7,E, +128064289,Int_ShieldGenerator_Size7_Class2,internal,Shield Generator,,,,7,D, +128064290,Int_ShieldGenerator_Size7_Class3,internal,Shield Generator,,,,7,C, +128064291,Int_ShieldGenerator_Size7_Class4,internal,Shield Generator,,,,7,B, +128064292,Int_ShieldGenerator_Size7_Class5,internal,Shield Generator,,,,7,A, +128064293,Int_ShieldGenerator_Size8_Class1,internal,Shield Generator,,,,8,E, +128064294,Int_ShieldGenerator_Size8_Class2,internal,Shield Generator,,,,8,D, +128064295,Int_ShieldGenerator_Size8_Class3,internal,Shield Generator,,,,8,C, +128064296,Int_ShieldGenerator_Size8_Class4,internal,Shield Generator,,,,8,B, +128064297,Int_ShieldGenerator_Size8_Class5,internal,Shield Generator,,,,8,A, +128064298,Int_ShieldCellBank_Size1_Class1,internal,Shield Cell Bank,,,,1,E, +128064299,Int_ShieldCellBank_Size1_Class2,internal,Shield Cell Bank,,,,1,D, +128064300,Int_ShieldCellBank_Size1_Class3,internal,Shield Cell Bank,,,,1,C, +128064301,Int_ShieldCellBank_Size1_Class4,internal,Shield Cell Bank,,,,1,B, +128064302,Int_ShieldCellBank_Size1_Class5,internal,Shield Cell Bank,,,,1,A, +128064303,Int_ShieldCellBank_Size2_Class1,internal,Shield Cell Bank,,,,2,E, +128064304,Int_ShieldCellBank_Size2_Class2,internal,Shield Cell Bank,,,,2,D, +128064305,Int_ShieldCellBank_Size2_Class3,internal,Shield Cell Bank,,,,2,C, +128064306,Int_ShieldCellBank_Size2_Class4,internal,Shield Cell Bank,,,,2,B, +128064307,Int_ShieldCellBank_Size2_Class5,internal,Shield Cell Bank,,,,2,A, +128064308,Int_ShieldCellBank_Size3_Class1,internal,Shield Cell Bank,,,,3,E, +128064309,Int_ShieldCellBank_Size3_Class2,internal,Shield Cell Bank,,,,3,D, +128064310,Int_ShieldCellBank_Size3_Class3,internal,Shield Cell Bank,,,,3,C, +128064311,Int_ShieldCellBank_Size3_Class4,internal,Shield Cell Bank,,,,3,B, +128064312,Int_ShieldCellBank_Size3_Class5,internal,Shield Cell Bank,,,,3,A, +128064313,Int_ShieldCellBank_Size4_Class1,internal,Shield Cell Bank,,,,4,E, +128064314,Int_ShieldCellBank_Size4_Class2,internal,Shield Cell Bank,,,,4,D, +128064315,Int_ShieldCellBank_Size4_Class3,internal,Shield Cell Bank,,,,4,C, +128064316,Int_ShieldCellBank_Size4_Class4,internal,Shield Cell Bank,,,,4,B, +128064317,Int_ShieldCellBank_Size4_Class5,internal,Shield Cell Bank,,,,4,A, +128064318,Int_ShieldCellBank_Size5_Class1,internal,Shield Cell Bank,,,,5,E, +128064319,Int_ShieldCellBank_Size5_Class2,internal,Shield Cell Bank,,,,5,D, +128064320,Int_ShieldCellBank_Size5_Class3,internal,Shield Cell Bank,,,,5,C, +128064321,Int_ShieldCellBank_Size5_Class4,internal,Shield Cell Bank,,,,5,B, +128064322,Int_ShieldCellBank_Size5_Class5,internal,Shield Cell Bank,,,,5,A, +128064323,Int_ShieldCellBank_Size6_Class1,internal,Shield Cell Bank,,,,6,E, +128064324,Int_ShieldCellBank_Size6_Class2,internal,Shield Cell Bank,,,,6,D, +128064325,Int_ShieldCellBank_Size6_Class3,internal,Shield Cell Bank,,,,6,C, +128064326,Int_ShieldCellBank_Size6_Class4,internal,Shield Cell Bank,,,,6,B, +128064327,Int_ShieldCellBank_Size6_Class5,internal,Shield Cell Bank,,,,6,A, +128064328,Int_ShieldCellBank_Size7_Class1,internal,Shield Cell Bank,,,,7,E, +128064329,Int_ShieldCellBank_Size7_Class2,internal,Shield Cell Bank,,,,7,D, +128064330,Int_ShieldCellBank_Size7_Class3,internal,Shield Cell Bank,,,,7,C, +128064331,Int_ShieldCellBank_Size7_Class4,internal,Shield Cell Bank,,,,7,B, +128064332,Int_ShieldCellBank_Size7_Class5,internal,Shield Cell Bank,,,,7,A, +128064333,Int_ShieldCellBank_Size8_Class1,internal,Shield Cell Bank,,,,8,E, +128064334,Int_ShieldCellBank_Size8_Class2,internal,Shield Cell Bank,,,,8,D, +128064335,Int_ShieldCellBank_Size8_Class3,internal,Shield Cell Bank,,,,8,C, +128064336,Int_ShieldCellBank_Size8_Class4,internal,Shield Cell Bank,,,,8,B, +128064337,Int_ShieldCellBank_Size8_Class5,internal,Shield Cell Bank,,,,8,A, +128064338,Int_CargoRack_Size1_Class1,internal,Cargo Rack,,,,1,E, +128064339,Int_CargoRack_Size2_Class1,internal,Cargo Rack,,,,2,E, +128064340,Int_CargoRack_Size3_Class1,internal,Cargo Rack,,,,3,E, +128064341,Int_CargoRack_Size4_Class1,internal,Cargo Rack,,,,4,E, +128064342,Int_CargoRack_Size5_Class1,internal,Cargo Rack,,,,5,E, +128064343,Int_CargoRack_Size6_Class1,internal,Cargo Rack,,,,6,E, +128064344,Int_CargoRack_Size7_Class1,internal,Cargo Rack,,,,7,E, +128064345,Int_CargoRack_Size8_Class1,internal,Cargo Rack,,,,8,E, +128064346,Int_FuelTank_Size1_Class3,standard,Fuel Tank,,,,1,C, +128064347,Int_FuelTank_Size2_Class3,standard,Fuel Tank,,,,2,C, +128064348,Int_FuelTank_Size3_Class3,standard,Fuel Tank,,,,3,C, +128064349,Int_FuelTank_Size4_Class3,standard,Fuel Tank,,,,4,C, +128064350,Int_FuelTank_Size5_Class3,standard,Fuel Tank,,,,5,C, +128064351,Int_FuelTank_Size6_Class3,standard,Fuel Tank,,,,6,C, +128064352,Int_FuelTank_Size7_Class3,standard,Fuel Tank,,,,7,C, +128064353,Int_FuelTank_Size8_Class3,standard,Fuel Tank,,,,8,C, +128066402,Int_DroneControl_ResourceSiphon,internal,Limpet Control,,,,1,I, +128066532,Int_DroneControl_ResourceSiphon_Size1_Class1,internal,Hatch Breaker Limpet Controller,,,,1,E, +128066533,Int_DroneControl_ResourceSiphon_Size1_Class2,internal,Hatch Breaker Limpet Controller,,,,1,D, +128066534,Int_DroneControl_ResourceSiphon_Size1_Class3,internal,Hatch Breaker Limpet Controller,,,,1,C, +128066535,Int_DroneControl_ResourceSiphon_Size1_Class4,internal,Hatch Breaker Limpet Controller,,,,1,B, +128066536,Int_DroneControl_ResourceSiphon_Size1_Class5,internal,Hatch Breaker Limpet Controller,,,,1,A, +128066537,Int_DroneControl_ResourceSiphon_Size3_Class1,internal,Hatch Breaker Limpet Controller,,,,3,E, +128066538,Int_DroneControl_ResourceSiphon_Size3_Class2,internal,Hatch Breaker Limpet Controller,,,,3,D, +128066539,Int_DroneControl_ResourceSiphon_Size3_Class3,internal,Hatch Breaker Limpet Controller,,,,3,C, +128066540,Int_DroneControl_ResourceSiphon_Size3_Class4,internal,Hatch Breaker Limpet Controller,,,,3,B, +128066541,Int_DroneControl_ResourceSiphon_Size3_Class5,internal,Hatch Breaker Limpet Controller,,,,3,A, +128066542,Int_DroneControl_ResourceSiphon_Size5_Class1,internal,Hatch Breaker Limpet Controller,,,,5,E, +128066543,Int_DroneControl_ResourceSiphon_Size5_Class2,internal,Hatch Breaker Limpet Controller,,,,5,D, +128066544,Int_DroneControl_ResourceSiphon_Size5_Class3,internal,Hatch Breaker Limpet Controller,,,,5,C, +128066545,Int_DroneControl_ResourceSiphon_Size5_Class4,internal,Hatch Breaker Limpet Controller,,,,5,B, +128066546,Int_DroneControl_ResourceSiphon_Size5_Class5,internal,Hatch Breaker Limpet Controller,,,,5,A, +128066547,Int_DroneControl_ResourceSiphon_Size7_Class1,internal,Hatch Breaker Limpet Controller,,,,7,E, +128066548,Int_DroneControl_ResourceSiphon_Size7_Class2,internal,Hatch Breaker Limpet Controller,,,,7,D, +128066549,Int_DroneControl_ResourceSiphon_Size7_Class3,internal,Hatch Breaker Limpet Controller,,,,7,C, +128066550,Int_DroneControl_ResourceSiphon_Size7_Class4,internal,Hatch Breaker Limpet Controller,,,,7,B, +128066551,Int_DroneControl_ResourceSiphon_Size7_Class5,internal,Hatch Breaker Limpet Controller,,,,7,A, +128662520,Hpt_CargoScanner_Size0_Class1,utility,Cargo Scanner,,,,0,E, +128662521,Hpt_CargoScanner_Size0_Class2,utility,Cargo Scanner,,,,0,D, +128662522,Hpt_CargoScanner_Size0_Class3,utility,Cargo Scanner,,,,0,C, +128662523,Hpt_CargoScanner_Size0_Class4,utility,Cargo Scanner,,,,0,B, +128662524,Hpt_CargoScanner_Size0_Class5,utility,Cargo Scanner,,,,0,A, +128662525,Hpt_CloudScanner_Size0_Class1,utility,Frame Shift Wake Scanner,,,,0,E, +128662526,Hpt_CloudScanner_Size0_Class2,utility,Frame Shift Wake Scanner,,,,0,D, +128662527,Hpt_CloudScanner_Size0_Class3,utility,Frame Shift Wake Scanner,,,,0,C, +128662528,Hpt_CloudScanner_Size0_Class4,utility,Frame Shift Wake Scanner,,,,0,B, +128662529,Hpt_CloudScanner_Size0_Class5,utility,Frame Shift Wake Scanner,,,,0,A, +128662530,Hpt_CrimeScanner_Size0_Class1,utility,Kill Warrant Scanner,,,,0,E, +128662531,Hpt_CrimeScanner_Size0_Class2,utility,Kill Warrant Scanner,,,,0,D, +128662532,Hpt_CrimeScanner_Size0_Class3,utility,Kill Warrant Scanner,,,,0,C, +128662533,Hpt_CrimeScanner_Size0_Class4,utility,Kill Warrant Scanner,,,,0,B, +128662534,Hpt_CrimeScanner_Size0_Class5,utility,Kill Warrant Scanner,,,,0,A, +128662535,Int_StellarBodyDiscoveryScanner_Standard,internal,Basic Discovery Scanner,,,,1,E,removed +128663560,Int_StellarBodyDiscoveryScanner_Intermediate,internal,Intermediate Discovery Scanner,,,,1,D,removed +128663561,Int_StellarBodyDiscoveryScanner_Advanced,internal,Advanced Discovery Scanner,,,,1,C,removed +128666634,Int_DetailedSurfaceScanner_Tiny,internal,Detailed Surface Scanner,,,,1,I, +128666635,Int_PowerPlant_Size2_Class1_free,standard,Power Plant,,,,2,E, +128666636,Int_Engine_Size2_Class1_free,standard,Thrusters,,,,2,E, +128666637,Int_Hyperdrive_Size2_Class1_free,standard,Frame Shift Drive,,,,2,E, +128666638,Int_LifeSupport_Size1_Class1_free,standard,Life Support,,,,1,E, +128666639,Int_PowerDistributor_Size1_Class1_free,standard,Power Distributor,,,,1,E, +128666640,Int_Sensors_Size1_Class1_free,standard,Sensors,,,,1,E, +128666641,Int_ShieldGenerator_Size2_Class1_free,internal,Shield Generator,,,,2,E, +128666642,Int_StellarBodyDiscoveryScanner_Standard_free,internal,Basic Discovery Scanner,,,,1,E, +128666643,Int_CargoRack_Size2_Class1_free,internal,Cargo Rack,,,,2,E, +128666644,Int_FuelScoop_Size1_Class1,internal,Fuel Scoop,,,,1,E, +128666645,Int_FuelScoop_Size2_Class1,internal,Fuel Scoop,,,,2,E, +128666646,Int_FuelScoop_Size3_Class1,internal,Fuel Scoop,,,,3,E, +128666647,Int_FuelScoop_Size4_Class1,internal,Fuel Scoop,,,,4,E, +128666648,Int_FuelScoop_Size5_Class1,internal,Fuel Scoop,,,,5,E, +128666649,Int_FuelScoop_Size6_Class1,internal,Fuel Scoop,,,,6,E, +128666650,Int_FuelScoop_Size7_Class1,internal,Fuel Scoop,,,,7,E, +128666651,Int_FuelScoop_Size8_Class1,internal,Fuel Scoop,,,,8,E, +128666652,Int_FuelScoop_Size1_Class2,internal,Fuel Scoop,,,,1,D, +128666653,Int_FuelScoop_Size2_Class2,internal,Fuel Scoop,,,,2,D, +128666654,Int_FuelScoop_Size3_Class2,internal,Fuel Scoop,,,,3,D, +128666655,Int_FuelScoop_Size4_Class2,internal,Fuel Scoop,,,,4,D, +128666656,Int_FuelScoop_Size5_Class2,internal,Fuel Scoop,,,,5,D, +128666657,Int_FuelScoop_Size6_Class2,internal,Fuel Scoop,,,,6,D, +128666658,Int_FuelScoop_Size7_Class2,internal,Fuel Scoop,,,,7,D, +128666659,Int_FuelScoop_Size8_Class2,internal,Fuel Scoop,,,,8,D, +128666660,Int_FuelScoop_Size1_Class3,internal,Fuel Scoop,,,,1,C, +128666661,Int_FuelScoop_Size2_Class3,internal,Fuel Scoop,,,,2,C, +128666662,Int_FuelScoop_Size3_Class3,internal,Fuel Scoop,,,,3,C, +128666663,Int_FuelScoop_Size4_Class3,internal,Fuel Scoop,,,,4,C, +128666664,Int_FuelScoop_Size5_Class3,internal,Fuel Scoop,,,,5,C, +128666665,Int_FuelScoop_Size6_Class3,internal,Fuel Scoop,,,,6,C, +128666666,Int_FuelScoop_Size7_Class3,internal,Fuel Scoop,,,,7,C, +128666667,Int_FuelScoop_Size8_Class3,internal,Fuel Scoop,,,,8,C, +128666668,Int_FuelScoop_Size1_Class4,internal,Fuel Scoop,,,,1,B, +128666669,Int_FuelScoop_Size2_Class4,internal,Fuel Scoop,,,,2,B, +128666670,Int_FuelScoop_Size3_Class4,internal,Fuel Scoop,,,,3,B, +128666671,Int_FuelScoop_Size4_Class4,internal,Fuel Scoop,,,,4,B, +128666672,Int_FuelScoop_Size5_Class4,internal,Fuel Scoop,,,,5,B, +128666673,Int_FuelScoop_Size6_Class4,internal,Fuel Scoop,,,,6,B, +128666674,Int_FuelScoop_Size7_Class4,internal,Fuel Scoop,,,,7,B, +128666675,Int_FuelScoop_Size8_Class4,internal,Fuel Scoop,,,,8,B, +128666676,Int_FuelScoop_Size1_Class5,internal,Fuel Scoop,,,,1,A, +128666677,Int_FuelScoop_Size2_Class5,internal,Fuel Scoop,,,,2,A, +128666678,Int_FuelScoop_Size3_Class5,internal,Fuel Scoop,,,,3,A, +128666679,Int_FuelScoop_Size4_Class5,internal,Fuel Scoop,,,,4,A, +128666680,Int_FuelScoop_Size5_Class5,internal,Fuel Scoop,,,,5,A, +128666681,Int_FuelScoop_Size6_Class5,internal,Fuel Scoop,,,,6,A, +128666682,Int_FuelScoop_Size7_Class5,internal,Fuel Scoop,,,,7,A, +128666683,Int_FuelScoop_Size8_Class5,internal,Fuel Scoop,,,,8,A, +128666684,Int_Refinery_Size1_Class1,internal,Refinery,,,,1,E, +128666685,Int_Refinery_Size2_Class1,internal,Refinery,,,,2,E, +128666686,Int_Refinery_Size3_Class1,internal,Refinery,,,,3,E, +128666687,Int_Refinery_Size4_Class1,internal,Refinery,,,,4,E, +128666688,Int_Refinery_Size1_Class2,internal,Refinery,,,,1,D, +128666689,Int_Refinery_Size2_Class2,internal,Refinery,,,,2,D, +128666690,Int_Refinery_Size3_Class2,internal,Refinery,,,,3,D, +128666691,Int_Refinery_Size4_Class2,internal,Refinery,,,,4,D, +128666692,Int_Refinery_Size1_Class3,internal,Refinery,,,,1,C, +128666693,Int_Refinery_Size2_Class3,internal,Refinery,,,,2,C, +128666694,Int_Refinery_Size3_Class3,internal,Refinery,,,,3,C, +128666695,Int_Refinery_Size4_Class3,internal,Refinery,,,,4,C, +128666696,Int_Refinery_Size1_Class4,internal,Refinery,,,,1,B, +128666697,Int_Refinery_Size2_Class4,internal,Refinery,,,,2,B, +128666698,Int_Refinery_Size3_Class4,internal,Refinery,,,,3,B, +128666699,Int_Refinery_Size4_Class4,internal,Refinery,,,,4,B, +128666700,Int_Refinery_Size1_Class5,internal,Refinery,,,,1,A, +128666701,Int_Refinery_Size2_Class5,internal,Refinery,,,,2,A, +128666702,Int_Refinery_Size3_Class5,internal,Refinery,,,,3,A, +128666703,Int_Refinery_Size4_Class5,internal,Refinery,,,,4,A, +128666704,Int_FSDInterdictor_Size1_Class1,internal,Frame Shift Drive Interdictor,,,,1,E, +128666705,Int_FSDInterdictor_Size2_Class1,internal,Frame Shift Drive Interdictor,,,,2,E, +128666706,Int_FSDInterdictor_Size3_Class1,internal,Frame Shift Drive Interdictor,,,,3,E, +128666707,Int_FSDInterdictor_Size4_Class1,internal,Frame Shift Drive Interdictor,,,,4,E, +128666708,Int_FSDInterdictor_Size1_Class2,internal,Frame Shift Drive Interdictor,,,,1,D, +128666709,Int_FSDInterdictor_Size2_Class2,internal,Frame Shift Drive Interdictor,,,,2,D, +128666710,Int_FSDInterdictor_Size3_Class2,internal,Frame Shift Drive Interdictor,,,,3,D, +128666711,Int_FSDInterdictor_Size4_Class2,internal,Frame Shift Drive Interdictor,,,,4,D, +128666712,Int_FSDInterdictor_Size1_Class3,internal,Frame Shift Drive Interdictor,,,,1,C, +128666713,Int_FSDInterdictor_Size2_Class3,internal,Frame Shift Drive Interdictor,,,,2,C, +128666714,Int_FSDInterdictor_Size3_Class3,internal,Frame Shift Drive Interdictor,,,,3,C, +128666715,Int_FSDInterdictor_Size4_Class3,internal,Frame Shift Drive Interdictor,,,,4,C, +128666716,Int_FSDInterdictor_Size1_Class4,internal,Frame Shift Drive Interdictor,,,,1,B, +128666717,Int_FSDInterdictor_Size2_Class4,internal,Frame Shift Drive Interdictor,,,,2,B, +128666718,Int_FSDInterdictor_Size3_Class4,internal,Frame Shift Drive Interdictor,,,,3,B, +128666719,Int_FSDInterdictor_Size4_Class4,internal,Frame Shift Drive Interdictor,,,,4,B, +128666720,Int_FSDInterdictor_Size1_Class5,internal,Frame Shift Drive Interdictor,,,,1,A, +128666721,Int_FSDInterdictor_Size2_Class5,internal,Frame Shift Drive Interdictor,,,,2,A, +128666722,Int_FSDInterdictor_Size3_Class5,internal,Frame Shift Drive Interdictor,,,,3,A, +128666723,Int_FSDInterdictor_Size4_Class5,internal,Frame Shift Drive Interdictor,,,,4,A, +128666724,Hpt_DumbfireMissileRack_Fixed_Small,hardpoint,Missile Rack,Fixed,Dumbfire,,1,B, +128666725,Hpt_DumbfireMissileRack_Fixed_Medium,hardpoint,Missile Rack,Fixed,Dumbfire,,2,B, +128667018,Int_FuelTank_Size1_Class3_free,standard,Fuel Tank,,,,1,C, +128667598,Int_Repairer_Size1_Class1,internal,Auto Field-Maintenance Unit,,,,1,E, +128667599,Int_Repairer_Size2_Class1,internal,Auto Field-Maintenance Unit,,,,2,E, +128667600,Int_Repairer_Size3_Class1,internal,Auto Field-Maintenance Unit,,,,3,E, +128667601,Int_Repairer_Size4_Class1,internal,Auto Field-Maintenance Unit,,,,4,E, +128667602,Int_Repairer_Size5_Class1,internal,Auto Field-Maintenance Unit,,,,5,E, +128667603,Int_Repairer_Size6_Class1,internal,Auto Field-Maintenance Unit,,,,6,E, +128667604,Int_Repairer_Size7_Class1,internal,Auto Field-Maintenance Unit,,,,7,E, +128667605,Int_Repairer_Size8_Class1,internal,Auto Field-Maintenance Unit,,,,8,E, +128667606,Int_Repairer_Size1_Class2,internal,Auto Field-Maintenance Unit,,,,1,D, +128667607,Int_Repairer_Size2_Class2,internal,Auto Field-Maintenance Unit,,,,2,D, +128667608,Int_Repairer_Size3_Class2,internal,Auto Field-Maintenance Unit,,,,3,D, +128667609,Int_Repairer_Size4_Class2,internal,Auto Field-Maintenance Unit,,,,4,D, +128667610,Int_Repairer_Size5_Class2,internal,Auto Field-Maintenance Unit,,,,5,D, +128667611,Int_Repairer_Size6_Class2,internal,Auto Field-Maintenance Unit,,,,6,D, +128667612,Int_Repairer_Size7_Class2,internal,Auto Field-Maintenance Unit,,,,7,D, +128667613,Int_Repairer_Size8_Class2,internal,Auto Field-Maintenance Unit,,,,8,D, +128667614,Int_Repairer_Size1_Class3,internal,Auto Field-Maintenance Unit,,,,1,C, +128667615,Int_Repairer_Size2_Class3,internal,Auto Field-Maintenance Unit,,,,2,C, +128667616,Int_Repairer_Size3_Class3,internal,Auto Field-Maintenance Unit,,,,3,C, +128667617,Int_Repairer_Size4_Class3,internal,Auto Field-Maintenance Unit,,,,4,C, +128667618,Int_Repairer_Size5_Class3,internal,Auto Field-Maintenance Unit,,,,5,C, +128667619,Int_Repairer_Size6_Class3,internal,Auto Field-Maintenance Unit,,,,6,C, +128667620,Int_Repairer_Size7_Class3,internal,Auto Field-Maintenance Unit,,,,7,C, +128667621,Int_Repairer_Size8_Class3,internal,Auto Field-Maintenance Unit,,,,8,C, +128667622,Int_Repairer_Size1_Class4,internal,Auto Field-Maintenance Unit,,,,1,B, +128667623,Int_Repairer_Size2_Class4,internal,Auto Field-Maintenance Unit,,,,2,B, +128667624,Int_Repairer_Size3_Class4,internal,Auto Field-Maintenance Unit,,,,3,B, +128667625,Int_Repairer_Size4_Class4,internal,Auto Field-Maintenance Unit,,,,4,B, +128667626,Int_Repairer_Size5_Class4,internal,Auto Field-Maintenance Unit,,,,5,B, +128667627,Int_Repairer_Size6_Class4,internal,Auto Field-Maintenance Unit,,,,6,B, +128667628,Int_Repairer_Size7_Class4,internal,Auto Field-Maintenance Unit,,,,7,B, +128667629,Int_Repairer_Size8_Class4,internal,Auto Field-Maintenance Unit,,,,8,B, +128667630,Int_Repairer_Size1_Class5,internal,Auto Field-Maintenance Unit,,,,1,A, +128667631,Int_Repairer_Size2_Class5,internal,Auto Field-Maintenance Unit,,,,2,A, +128667632,Int_Repairer_Size3_Class5,internal,Auto Field-Maintenance Unit,,,,3,A, +128667633,Int_Repairer_Size4_Class5,internal,Auto Field-Maintenance Unit,,,,4,A, +128667634,Int_Repairer_Size5_Class5,internal,Auto Field-Maintenance Unit,,,,5,A, +128667635,Int_Repairer_Size6_Class5,internal,Auto Field-Maintenance Unit,,,,6,A, +128667636,Int_Repairer_Size7_Class5,internal,Auto Field-Maintenance Unit,,,,7,A, +128667637,Int_Repairer_Size8_Class5,internal,Auto Field-Maintenance Unit,,,,8,A, +128668532,Hpt_ShieldBooster_Size0_Class1,utility,Shield Booster,,,,0,E, +128668533,Hpt_ShieldBooster_Size0_Class2,utility,Shield Booster,,,,0,D, +128668534,Hpt_ShieldBooster_Size0_Class3,utility,Shield Booster,,,,0,C, +128668535,Hpt_ShieldBooster_Size0_Class4,utility,Shield Booster,,,,0,B, +128668536,Hpt_ShieldBooster_Size0_Class5,utility,Shield Booster,,,,0,A, +128668537,Int_HullReinforcement_Size1_Class1,internal,Hull Reinforcement Package,,,,1,E, +128668538,Int_HullReinforcement_Size1_Class2,internal,Hull Reinforcement Package,,,,1,D, +128668539,Int_HullReinforcement_Size2_Class1,internal,Hull Reinforcement Package,,,,2,E, +128668540,Int_HullReinforcement_Size2_Class2,internal,Hull Reinforcement Package,,,,2,D, +128668541,Int_HullReinforcement_Size3_Class1,internal,Hull Reinforcement Package,,,,3,E, +128668542,Int_HullReinforcement_Size3_Class2,internal,Hull Reinforcement Package,,,,3,D, +128668543,Int_HullReinforcement_Size4_Class1,internal,Hull Reinforcement Package,,,,4,E, +128668544,Int_HullReinforcement_Size4_Class2,internal,Hull Reinforcement Package,,,,4,D, +128668545,Int_HullReinforcement_Size5_Class1,internal,Hull Reinforcement Package,,,,5,E, +128668546,Int_HullReinforcement_Size5_Class2,internal,Hull Reinforcement Package,,,,5,D, +128671120,Hpt_Cannon_Gimbal_Large,hardpoint,Cannon,Gimballed,,,3,C, +128671218,DiamondBack_Armour_Grade1,standard,Lightweight Alloy,,,Diamondback Scout,1,I, +128671219,DiamondBack_Armour_Grade2,standard,Reinforced Alloy,,,Diamondback Scout,1,I, +128671220,DiamondBack_Armour_Grade3,standard,Military Grade Composite,,,Diamondback Scout,1,I, +128671221,DiamondBack_Armour_Mirrored,standard,Mirrored Surface Composite,,,Diamondback Scout,1,I, +128671222,DiamondBack_Armour_Reactive,standard,Reactive Surface Composite,,,Diamondback Scout,1,I, +128671224,Empire_Courier_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Courier,1,I, +128671225,Empire_Courier_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Courier,1,I, +128671226,Empire_Courier_Armour_Grade3,standard,Military Grade Composite,,,Imperial Courier,1,I, +128671227,Empire_Courier_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Courier,1,I, +128671228,Empire_Courier_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Courier,1,I, +128671229,Int_DroneControl_Collection_Size1_Class1,internal,Collector Limpet Controller,,,,1,E, +128671230,Int_DroneControl_Collection_Size1_Class2,internal,Collector Limpet Controller,,,,1,D, +128671231,Int_DroneControl_Collection_Size1_Class3,internal,Collector Limpet Controller,,,,1,C, +128671232,Int_DroneControl_Collection_Size1_Class4,internal,Collector Limpet Controller,,,,1,B, +128671233,Int_DroneControl_Collection_Size1_Class5,internal,Collector Limpet Controller,,,,1,A, +128671234,Int_DroneControl_Collection_Size3_Class1,internal,Collector Limpet Controller,,,,3,E, +128671235,Int_DroneControl_Collection_Size3_Class2,internal,Collector Limpet Controller,,,,3,D, +128671236,Int_DroneControl_Collection_Size3_Class3,internal,Collector Limpet Controller,,,,3,C, +128671237,Int_DroneControl_Collection_Size3_Class4,internal,Collector Limpet Controller,,,,3,B, +128671238,Int_DroneControl_Collection_Size3_Class5,internal,Collector Limpet Controller,,,,3,A, +128671239,Int_DroneControl_Collection_Size5_Class1,internal,Collector Limpet Controller,,,,5,E, +128671240,Int_DroneControl_Collection_Size5_Class2,internal,Collector Limpet Controller,,,,5,D, +128671241,Int_DroneControl_Collection_Size5_Class3,internal,Collector Limpet Controller,,,,5,C, +128671242,Int_DroneControl_Collection_Size5_Class4,internal,Collector Limpet Controller,,,,5,B, +128671243,Int_DroneControl_Collection_Size5_Class5,internal,Collector Limpet Controller,,,,5,A, +128671244,Int_DroneControl_Collection_Size7_Class1,internal,Collector Limpet Controller,,,,7,E, +128671245,Int_DroneControl_Collection_Size7_Class2,internal,Collector Limpet Controller,,,,7,D, +128671246,Int_DroneControl_Collection_Size7_Class3,internal,Collector Limpet Controller,,,,7,C, +128671247,Int_DroneControl_Collection_Size7_Class4,internal,Collector Limpet Controller,,,,7,B, +128671248,Int_DroneControl_Collection_Size7_Class5,internal,Collector Limpet Controller,,,,7,A, +128671249,Int_DroneControl_FuelTransfer_Size1_Class1,internal,Fuel Transfer Limpet Controller,,,,1,E, +128671250,Int_DroneControl_FuelTransfer_Size1_Class2,internal,Fuel Transfer Limpet Controller,,,,1,D, +128671251,Int_DroneControl_FuelTransfer_Size1_Class3,internal,Fuel Transfer Limpet Controller,,,,1,C, +128671252,Int_DroneControl_FuelTransfer_Size1_Class4,internal,Fuel Transfer Limpet Controller,,,,1,B, +128671253,Int_DroneControl_FuelTransfer_Size1_Class5,internal,Fuel Transfer Limpet Controller,,,,1,A, +128671254,Int_DroneControl_FuelTransfer_Size3_Class1,internal,Fuel Transfer Limpet Controller,,,,3,E, +128671255,Int_DroneControl_FuelTransfer_Size3_Class2,internal,Fuel Transfer Limpet Controller,,,,3,D, +128671256,Int_DroneControl_FuelTransfer_Size3_Class3,internal,Fuel Transfer Limpet Controller,,,,3,C, +128671257,Int_DroneControl_FuelTransfer_Size3_Class4,internal,Fuel Transfer Limpet Controller,,,,3,B, +128671258,Int_DroneControl_FuelTransfer_Size3_Class5,internal,Fuel Transfer Limpet Controller,,,,3,A, +128671259,Int_DroneControl_FuelTransfer_Size5_Class1,internal,Fuel Transfer Limpet Controller,,,,5,E, +128671260,Int_DroneControl_FuelTransfer_Size5_Class2,internal,Fuel Transfer Limpet Controller,,,,5,D, +128671261,Int_DroneControl_FuelTransfer_Size5_Class3,internal,Fuel Transfer Limpet Controller,,,,5,C, +128671262,Int_DroneControl_FuelTransfer_Size5_Class4,internal,Fuel Transfer Limpet Controller,,,,5,B, +128671263,Int_DroneControl_FuelTransfer_Size5_Class5,internal,Fuel Transfer Limpet Controller,,,,5,A, +128671264,Int_DroneControl_FuelTransfer_Size7_Class1,internal,Fuel Transfer Limpet Controller,,,,7,E, +128671265,Int_DroneControl_FuelTransfer_Size7_Class2,internal,Fuel Transfer Limpet Controller,,,,7,D, +128671266,Int_DroneControl_FuelTransfer_Size7_Class3,internal,Fuel Transfer Limpet Controller,,,,7,C, +128671267,Int_DroneControl_FuelTransfer_Size7_Class4,internal,Fuel Transfer Limpet Controller,,,,7,B, +128671268,Int_DroneControl_FuelTransfer_Size7_Class5,internal,Fuel Transfer Limpet Controller,,,,7,A, +128671269,Int_DroneControl_Prospector_Size1_Class1,internal,Prospector Limpet Controller,,,,1,E, +128671270,Int_DroneControl_Prospector_Size1_Class2,internal,Prospector Limpet Controller,,,,1,D, +128671271,Int_DroneControl_Prospector_Size1_Class3,internal,Prospector Limpet Controller,,,,1,C, +128671272,Int_DroneControl_Prospector_Size1_Class4,internal,Prospector Limpet Controller,,,,1,B, +128671273,Int_DroneControl_Prospector_Size1_Class5,internal,Prospector Limpet Controller,,,,1,A, +128671274,Int_DroneControl_Prospector_Size3_Class1,internal,Prospector Limpet Controller,,,,3,E, +128671275,Int_DroneControl_Prospector_Size3_Class2,internal,Prospector Limpet Controller,,,,3,D, +128671276,Int_DroneControl_Prospector_Size3_Class3,internal,Prospector Limpet Controller,,,,3,C, +128671277,Int_DroneControl_Prospector_Size3_Class4,internal,Prospector Limpet Controller,,,,3,B, +128671278,Int_DroneControl_Prospector_Size3_Class5,internal,Prospector Limpet Controller,,,,3,A, +128671279,Int_DroneControl_Prospector_Size5_Class1,internal,Prospector Limpet Controller,,,,5,E, +128671280,Int_DroneControl_Prospector_Size5_Class2,internal,Prospector Limpet Controller,,,,5,D, +128671281,Int_DroneControl_Prospector_Size5_Class3,internal,Prospector Limpet Controller,,,,5,C, +128671282,Int_DroneControl_Prospector_Size5_Class4,internal,Prospector Limpet Controller,,,,5,B, +128671283,Int_DroneControl_Prospector_Size5_Class5,internal,Prospector Limpet Controller,,,,5,A, +128671284,Int_DroneControl_Prospector_Size7_Class1,internal,Prospector Limpet Controller,,,,7,E, +128671285,Int_DroneControl_Prospector_Size7_Class2,internal,Prospector Limpet Controller,,,,7,D, +128671286,Int_DroneControl_Prospector_Size7_Class3,internal,Prospector Limpet Controller,,,,7,C, +128671287,Int_DroneControl_Prospector_Size7_Class4,internal,Prospector Limpet Controller,,,,7,B, +128671288,Int_DroneControl_Prospector_Size7_Class5,internal,Prospector Limpet Controller,,,,7,A, +128671321,Hpt_Slugshot_Gimbal_Large,hardpoint,Fragment Cannon,Gimballed,,,3,C, +128671322,Hpt_Slugshot_Turret_Large,hardpoint,Fragment Cannon,Turreted,,,3,C, +128671323,Int_ShieldGenerator_Size1_Class5_Strong,internal,Prismatic Shield Generator,,,,1,A,ELITE_SPECIFIC_V_POWER_100000 +128671324,Int_ShieldGenerator_Size2_Class5_Strong,internal,Prismatic Shield Generator,,,,2,A,ELITE_SPECIFIC_V_POWER_100000 +128671325,Int_ShieldGenerator_Size3_Class5_Strong,internal,Prismatic Shield Generator,,,,3,A,ELITE_SPECIFIC_V_POWER_100000 +128671326,Int_ShieldGenerator_Size4_Class5_Strong,internal,Prismatic Shield Generator,,,,4,A,ELITE_SPECIFIC_V_POWER_100000 +128671327,Int_ShieldGenerator_Size5_Class5_Strong,internal,Prismatic Shield Generator,,,,5,A,ELITE_SPECIFIC_V_POWER_100000 +128671328,Int_ShieldGenerator_Size6_Class5_Strong,internal,Prismatic Shield Generator,,,,6,A,ELITE_SPECIFIC_V_POWER_100000 +128671329,Int_ShieldGenerator_Size7_Class5_Strong,internal,Prismatic Shield Generator,,,,7,A,ELITE_SPECIFIC_V_POWER_100000 +128671330,Int_ShieldGenerator_Size8_Class5_Strong,internal,Prismatic Shield Generator,,,,8,A,ELITE_SPECIFIC_V_POWER_100000 +128671331,Int_ShieldGenerator_Size1_Class3_Fast,internal,Bi-Weave Shield Generator,,,,1,C, +128671332,Int_ShieldGenerator_Size2_Class3_Fast,internal,Bi-Weave Shield Generator,,,,2,C, +128671333,Int_ShieldGenerator_Size3_Class3_Fast,internal,Bi-Weave Shield Generator,,,,3,C, +128671334,Int_ShieldGenerator_Size4_Class3_Fast,internal,Bi-Weave Shield Generator,,,,4,C, +128671335,Int_ShieldGenerator_Size5_Class3_Fast,internal,Bi-Weave Shield Generator,,,,5,C, +128671336,Int_ShieldGenerator_Size6_Class3_Fast,internal,Bi-Weave Shield Generator,,,,6,C, +128671337,Int_ShieldGenerator_Size7_Class3_Fast,internal,Bi-Weave Shield Generator,,,,7,C, +128671338,Int_ShieldGenerator_Size8_Class3_Fast,internal,Bi-Weave Shield Generator,,,,8,C, +128671339,Hpt_PlasmaAccelerator_Fixed_Large_Advanced,hardpoint,Advanced Plasma Accelerator,Fixed,,,3,B,ELITE_SPECIFIC_V_POWER_100050 +128671340,Hpt_MiningLaser_Fixed_Small_Advanced,hardpoint,Mining Lance,Fixed,,,1,D,ELITE_SPECIFIC_V_POWER_100080 +128671341,Hpt_Railgun_Fixed_Medium_Burst,hardpoint,Imperial Hammer Rail Gun,Fixed,,,2,B,ELITE_SPECIFIC_V_POWER_100020 +128671342,Hpt_PulseLaser_Fixed_Medium_Disruptor,hardpoint,Pulse Disruptor Laser,Fixed,,,2,E,ELITE_SPECIFIC_V_POWER_100040 +128671343,Hpt_Slugshot_Fixed_Large_Range,hardpoint,Pacifier Frag-Cannon,Fixed,,,3,C,ELITE_SPECIFIC_V_POWER_100060 +128671344,Hpt_DrunkMissileRack_Fixed_Medium,hardpoint,Pack-Hound Missile Rack,Fixed,Swarm,,2,B,ELITE_SPECIFIC_V_POWER_100070 +128671345,Hpt_MultiCannon_Fixed_Small_Strong,hardpoint,Enforcer Cannon,Fixed,,,1,F,ELITE_SPECIFIC_V_POWER_100090 +128671346,Hpt_BeamLaser_Fixed_Small_Heat,hardpoint,Retributor Beam Laser,Fixed,,,1,E,ELITE_SPECIFIC_V_POWER_100010 +128671448,Hpt_MineLauncher_Fixed_Small_Impulse,hardpoint,Shock Mine Launcher,Fixed,,,1,I, +128671449,Hpt_PulseLaserBurst_Fixed_Small_Scatter,hardpoint,Cytoscrambler Burst Laser,Fixed,,,1,F,ELITE_SPECIFIC_V_POWER_100100 +128671832,DiamondBackXL_Armour_Grade1,standard,Lightweight Alloy,,,Diamondback Explorer,1,I, +128671833,DiamondBackXL_Armour_Grade2,standard,Reinforced Alloy,,,Diamondback Explorer,1,I, +128671834,DiamondBackXL_Armour_Grade3,standard,Military Grade Composite,,,Diamondback Explorer,1,I, +128671835,DiamondBackXL_Armour_Mirrored,standard,Mirrored Surface Composite,,,Diamondback Explorer,1,I, +128671836,DiamondBackXL_Armour_Reactive,standard,Reactive Surface Composite,,,Diamondback Explorer,1,I, +128672140,Empire_Eagle_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Eagle,1,I, +128672141,Empire_Eagle_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Eagle,1,I, +128672142,Empire_Eagle_Armour_Grade3,standard,Military Grade Composite,,,Imperial Eagle,1,I, +128672143,Empire_Eagle_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Eagle,1,I, +128672144,Empire_Eagle_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Eagle,1,I, +128672147,Federation_Dropship_MkII_Armour_Grade1,standard,Lightweight Alloy,,,Federal Assault Ship,1,I, +128672148,Federation_Dropship_MkII_Armour_Grade2,standard,Reinforced Alloy,,,Federal Assault Ship,1,I, +128672149,Federation_Dropship_MkII_Armour_Grade3,standard,Military Grade Composite,,,Federal Assault Ship,1,I, +128672150,Federation_Dropship_MkII_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Assault Ship,1,I, +128672151,Federation_Dropship_MkII_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Assault Ship,1,I, +128672154,Federation_Gunship_Armour_Grade1,standard,Lightweight Alloy,,,Federal Gunship,1,I, +128672155,Federation_Gunship_Armour_Grade2,standard,Reinforced Alloy,,,Federal Gunship,1,I, +128672156,Federation_Gunship_Armour_Grade3,standard,Military Grade Composite,,,Federal Gunship,1,I, +128672157,Federation_Gunship_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Gunship,1,I, +128672158,Federation_Gunship_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Gunship,1,I, +128672257,Viper_MkIV_Armour_Grade1,standard,Lightweight Alloy,,,Viper MkIV,1,I, +128672258,Viper_MkIV_Armour_Grade2,standard,Reinforced Alloy,,,Viper MkIV,1,I, +128672259,Viper_MkIV_Armour_Grade3,standard,Military Grade Composite,,,Viper MkIV,1,I, +128672260,Viper_MkIV_Armour_Mirrored,standard,Mirrored Surface Composite,,,Viper MkIV,1,I, +128672261,Viper_MkIV_Armour_Reactive,standard,Reactive Surface Composite,,,Viper MkIV,1,I, +128672264,CobraMkIV_Armour_Grade1,standard,Lightweight Alloy,,,Cobra MkIV,1,I, +128672265,CobraMkIV_Armour_Grade2,standard,Reinforced Alloy,,,Cobra MkIV,1,I, +128672266,CobraMkIV_Armour_Grade3,standard,Military Grade Composite,,,Cobra MkIV,1,I, +128672267,CobraMkIV_Armour_Mirrored,standard,Mirrored Surface Composite,,,Cobra MkIV,1,I, +128672268,CobraMkIV_Armour_Reactive,standard,Reactive Surface Composite,,,Cobra MkIV,1,I, +128672271,Independant_Trader_Armour_Grade1,standard,Lightweight Alloy,,,Keelback,1,I, +128672272,Independant_Trader_Armour_Grade2,standard,Reinforced Alloy,,,Keelback,1,I, +128672273,Independant_Trader_Armour_Grade3,standard,Military Grade Composite,,,Keelback,1,I, +128672274,Independant_Trader_Armour_Mirrored,standard,Mirrored Surface Composite,,,Keelback,1,I, +128672275,Independant_Trader_Armour_Reactive,standard,Reactive Surface Composite,,,Keelback,1,I, +128672278,Asp_Scout_Armour_Grade1,standard,Lightweight Alloy,,,Asp Scout,1,I, +128672279,Asp_Scout_Armour_Grade2,standard,Reinforced Alloy,,,Asp Scout,1,I, +128672280,Asp_Scout_Armour_Grade3,standard,Military Grade Composite,,,Asp Scout,1,I, +128672281,Asp_Scout_Armour_Mirrored,standard,Mirrored Surface Composite,,,Asp Scout,1,I, +128672282,Asp_Scout_Armour_Reactive,standard,Reactive Surface Composite,,,Asp Scout,1,I, +128672288,Int_BuggyBay_Size2_Class1,internal,Planetary Vehicle Hangar,,,,2,H,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128672289,Int_BuggyBay_Size2_Class2,internal,Planetary Vehicle Hangar,,,,2,G,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128672290,Int_BuggyBay_Size4_Class1,internal,Planetary Vehicle Hangar,,,,4,H,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128672291,Int_BuggyBay_Size4_Class2,internal,Planetary Vehicle Hangar,,,,4,G,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128672292,Int_BuggyBay_Size6_Class1,internal,Planetary Vehicle Hangar,,,,6,H,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128672293,Int_BuggyBay_Size6_Class2,internal,Planetary Vehicle Hangar,,,,6,G,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128672317,Int_PlanetApproachSuite,internal,Planetary Approach Suite,,,,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128681641,Int_CorrosionProofCargoRack_Size1_Class1,internal,Corrosion Resistant Cargo Rack,,,,1,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128681992,Int_CorrosionProofCargoRack_Size1_Class2,internal,Corrosion Resistant Cargo Rack,,,,1,F,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128681994,Hpt_BeamLaser_Gimbal_Huge,hardpoint,Beam Laser,Gimballed,,,4,A, +128681995,Hpt_PulseLaser_Gimbal_Huge,hardpoint,Pulse Laser,Gimballed,,,4,A, +128681996,Hpt_MultiCannon_Gimbal_Huge,hardpoint,Multi-Cannon,Gimballed,,,4,A, +128682013,Int_Engine_Size3_Class5_Fast,standard,Enhanced Performance Thrusters,,,,3,A, +128682014,Int_Engine_Size2_Class5_Fast,standard,Enhanced Performance Thrusters,,,,2,A, +128727920,Hpt_PulseLaserBurst_Gimbal_Huge,hardpoint,Burst Laser,Gimballed,,,4,E, +128727922,Int_PassengerCabin_Size4_Class1,internal,Economy Class Passenger Cabin,,,,4,E, +128727923,Int_PassengerCabin_Size4_Class2,internal,Business Class Passenger Cabin,,,,4,D, +128727924,Int_PassengerCabin_Size4_Class3,internal,First Class Passenger Cabin,,,,4,C, +128727925,Int_PassengerCabin_Size5_Class4,internal,Luxury Class Passenger Cabin,,,,5,B, +128727926,Int_PassengerCabin_Size6_Class1,internal,Economy Class Passenger Cabin,,,,6,E, +128727927,Int_PassengerCabin_Size6_Class2,internal,Business Class Passenger Cabin,,,,6,D, +128727928,Int_PassengerCabin_Size6_Class3,internal,First Class Passenger Cabin,,,,6,C, +128727929,Int_PassengerCabin_Size6_Class4,internal,Luxury Class Passenger Cabin,,,,6,B, +128727930,Int_FighterBay_Size5_Class1,internal,Fighter Hangar,,,,5,D,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128727931,Int_FighterBay_Size6_Class1,internal,Fighter Hangar,,,,6,D,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128727932,Int_FighterBay_Size7_Class1,internal,Fighter Hangar,,,,7,D,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128732552,Hpt_DumbfireMissileRack_Fixed_Medium_Lasso,hardpoint,Rocket Propelled FSD Disruptor,Fixed,Dumbfire,,2,B,ELITE_SPECIFIC_V_POWER_100120 +128734690,Int_PassengerCabin_Size2_Class1,internal,Economy Class Passenger Cabin,,,,2,E, +128734691,Int_PassengerCabin_Size3_Class1,internal,Economy Class Passenger Cabin,,,,3,E, +128734692,Int_PassengerCabin_Size3_Class2,internal,Business Class Passenger Cabin,,,,3,D, +128734693,Int_PassengerCabin_Size5_Class1,internal,Economy Class Passenger Cabin,,,,5,E, +128734694,Int_PassengerCabin_Size5_Class2,internal,Business Class Passenger Cabin,,,,5,D, +128734695,Int_PassengerCabin_Size5_Class3,internal,First Class Passenger Cabin,,,,5,C, +128737270,Int_ModuleReinforcement_Size1_Class1,internal,Module Reinforcement Package,,,,1,E, +128737271,Int_ModuleReinforcement_Size1_Class2,internal,Module Reinforcement Package,,,,1,D, +128737272,Int_ModuleReinforcement_Size2_Class1,internal,Module Reinforcement Package,,,,2,E, +128737273,Int_ModuleReinforcement_Size2_Class2,internal,Module Reinforcement Package,,,,2,D, +128737274,Int_ModuleReinforcement_Size3_Class1,internal,Module Reinforcement Package,,,,3,E, +128737275,Int_ModuleReinforcement_Size3_Class2,internal,Module Reinforcement Package,,,,3,D, +128737276,Int_ModuleReinforcement_Size4_Class1,internal,Module Reinforcement Package,,,,4,E, +128737277,Int_ModuleReinforcement_Size4_Class2,internal,Module Reinforcement Package,,,,4,D, +128737278,Int_ModuleReinforcement_Size5_Class1,internal,Module Reinforcement Package,,,,5,E, +128737279,Int_ModuleReinforcement_Size5_Class2,internal,Module Reinforcement Package,,,,5,D, +128740819,Hpt_MiningLaser_Turret_Small,hardpoint,Mining Laser,Turreted,,,1,D, +128740820,Hpt_MiningLaser_Turret_Medium,hardpoint,Mining Laser,Turreted,,,2,D, +128771884,Hpt_AntiUnknownShutdown_Tiny,utility,Shutdown Field Neutraliser,,,,0,F,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128777327,Int_DroneControl_Repair_Size1_Class1,internal,Repair Limpet Controller,,,,1,E, +128777328,Int_DroneControl_Repair_Size1_Class2,internal,Repair Limpet Controller,,,,1,D, +128777329,Int_DroneControl_Repair_Size1_Class3,internal,Repair Limpet Controller,,,,1,C, +128777330,Int_DroneControl_Repair_Size1_Class4,internal,Repair Limpet Controller,,,,1,B, +128777331,Int_DroneControl_Repair_Size1_Class5,internal,Repair Limpet Controller,,,,1,A, +128777332,Int_DroneControl_Repair_Size3_Class1,internal,Repair Limpet Controller,,,,3,E, +128777333,Int_DroneControl_Repair_Size3_Class2,internal,Repair Limpet Controller,,,,3,D, +128777334,Int_DroneControl_Repair_Size3_Class3,internal,Repair Limpet Controller,,,,3,C, +128777335,Int_DroneControl_Repair_Size3_Class4,internal,Repair Limpet Controller,,,,3,B, +128777336,Int_DroneControl_Repair_Size3_Class5,internal,Repair Limpet Controller,,,,3,A, +128777337,Int_DroneControl_Repair_Size5_Class1,internal,Repair Limpet Controller,,,,5,E, +128777338,Int_DroneControl_Repair_Size5_Class2,internal,Repair Limpet Controller,,,,5,D, +128777339,Int_DroneControl_Repair_Size5_Class3,internal,Repair Limpet Controller,,,,5,C, +128777340,Int_DroneControl_Repair_Size5_Class4,internal,Repair Limpet Controller,,,,5,B, +128777341,Int_DroneControl_Repair_Size5_Class5,internal,Repair Limpet Controller,,,,5,A, +128777342,Int_DroneControl_Repair_Size7_Class1,internal,Repair Limpet Controller,,,,7,E, +128777343,Int_DroneControl_Repair_Size7_Class2,internal,Repair Limpet Controller,,,,7,D, +128777344,Int_DroneControl_Repair_Size7_Class3,internal,Repair Limpet Controller,,,,7,C, +128777345,Int_DroneControl_Repair_Size7_Class4,internal,Repair Limpet Controller,,,,7,B, +128777346,Int_DroneControl_Repair_Size7_Class5,internal,Repair Limpet Controller,,,,7,A, +128785621,Type9_Military_Armour_Grade1,standard,Lightweight Alloy,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128785622,Type9_Military_Armour_Grade2,standard,Reinforced Alloy,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128785623,Type9_Military_Armour_Grade3,standard,Military Grade Composite,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128785624,Type9_Military_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128785625,Type9_Military_Armour_Reactive,standard,Reactive Surface Composite,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128785626,Hpt_FlakMortar_Fixed_Medium,hardpoint,Remote Release Flak Launcher,Fixed,,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128788699,Hpt_ATDumbfireMissile_Fixed_Medium,hardpoint,AX Missile Rack,Fixed,Dumbfire,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128788700,Hpt_ATDumbfireMissile_Fixed_Large,hardpoint,AX Missile Rack,Fixed,Dumbfire,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128788701,Hpt_ATMultiCannon_Fixed_Medium,hardpoint,AX Multi-Cannon,Fixed,,,2,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128788702,Hpt_ATMultiCannon_Fixed_Large,hardpoint,AX Multi-Cannon,Fixed,,,3,C,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128788704,Hpt_ATDumbfireMissile_Turret_Medium,hardpoint,AX Missile Rack,Turreted,Dumbfire,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128788705,Hpt_ATDumbfireMissile_Turret_Large,hardpoint,AX Missile Rack,Turreted,Dumbfire,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793058,Hpt_FlakMortar_Turret_Medium,hardpoint,Remote Release Flak Launcher,Turreted,,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793059,Hpt_ATMultiCannon_Turret_Medium,hardpoint,AX Multi-Cannon,Turreted,,,2,F,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793060,Hpt_ATMultiCannon_Turret_Large,hardpoint,AX Multi-Cannon,Turreted,,,3,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793115,Hpt_XenoScanner_Basic_Tiny,utility,Xeno Scanner,,,,0,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793116,Int_DroneControl_UnkVesselResearch,internal,Research Limpet Controller,,,,1,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793117,Int_MetaAlloyHullReinforcement_Size1_Class1,internal,Meta Alloy Hull Reinforcement,,,,1,E,ELITE_HORIZONS_V_METAHULL +128793118,Int_MetaAlloyHullReinforcement_Size1_Class2,internal,Meta Alloy Hull Reinforcement,,,,1,D,ELITE_HORIZONS_V_METAHULL +128793119,Int_MetaAlloyHullReinforcement_Size2_Class1,internal,Meta Alloy Hull Reinforcement,,,,2,E,ELITE_HORIZONS_V_METAHULL +128793120,Int_MetaAlloyHullReinforcement_Size2_Class2,internal,Meta Alloy Hull Reinforcement,,,,2,D,ELITE_HORIZONS_V_METAHULL +128793121,Int_MetaAlloyHullReinforcement_Size3_Class1,internal,Meta Alloy Hull Reinforcement,,,,3,E,ELITE_HORIZONS_V_METAHULL +128793122,Int_MetaAlloyHullReinforcement_Size3_Class2,internal,Meta Alloy Hull Reinforcement,,,,3,D,ELITE_HORIZONS_V_METAHULL +128793123,Int_MetaAlloyHullReinforcement_Size4_Class1,internal,Meta Alloy Hull Reinforcement,,,,4,E,ELITE_HORIZONS_V_METAHULL +128793124,Int_MetaAlloyHullReinforcement_Size4_Class2,internal,Meta Alloy Hull Reinforcement,,,,4,D,ELITE_HORIZONS_V_METAHULL +128793125,Int_MetaAlloyHullReinforcement_Size5_Class1,internal,Meta Alloy Hull Reinforcement,,,,5,E,ELITE_HORIZONS_V_METAHULL +128793126,Int_MetaAlloyHullReinforcement_Size5_Class2,internal,Meta Alloy Hull Reinforcement,,,,5,D,ELITE_HORIZONS_V_METAHULL +128793941,Int_DroneControl_Decontamination_Size1_Class1,internal,Decontamination Limpet Controller,,,,1,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793942,Int_DroneControl_Decontamination_Size3_Class1,internal,Decontamination Limpet Controller,,,,3,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793943,Int_DroneControl_Decontamination_Size5_Class1,internal,Decontamination Limpet Controller,,,,5,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128793944,Int_DroneControl_Decontamination_Size7_Class1,internal,Decontamination Limpet Controller,,,,7,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128808878,Hpt_XenoScannerMk2_Basic_Tiny,utility,Unknown Xeno Scanner Mk II,,,,?,?,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816569,Krait_MkII_Armour_Grade1,standard,Lightweight Alloy,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816570,Krait_MkII_Armour_Grade2,standard,Reinforced Alloy,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816571,Krait_MkII_Armour_Grade3,standard,Military Grade Composite,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816572,Krait_MkII_Armour_Mirrored,standard,Mirrored Surface Composite,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816573,Krait_MkII_Armour_Reactive,standard,Reactive Surface Composite,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816576,TypeX_Armour_Grade1,standard,Lightweight Alloy,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816577,TypeX_Armour_Grade2,standard,Reinforced Alloy,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816578,TypeX_Armour_Grade3,standard,Military Grade Composite,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816579,TypeX_Armour_Mirrored,standard,Mirrored Surface Composite,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816580,TypeX_Armour_Reactive,standard,Reactive Surface Composite,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816583,TypeX_2_Armour_Grade1,standard,Lightweight Alloy,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816584,TypeX_2_Armour_Grade2,standard,Reinforced Alloy,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816585,TypeX_2_Armour_Grade3,standard,Military Grade Composite,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816586,TypeX_2_Armour_Mirrored,standard,Mirrored Surface Composite,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816587,TypeX_2_Armour_Reactive,standard,Reactive Surface Composite,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816590,TypeX_3_Armour_Grade1,standard,Lightweight Alloy,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816591,TypeX_3_Armour_Grade2,standard,Reinforced Alloy,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816592,TypeX_3_Armour_Grade3,standard,Military Grade Composite,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816593,TypeX_3_Armour_Mirrored,standard,Mirrored Surface Composite,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128816594,TypeX_3_Armour_Reactive,standard,Reactive Surface Composite,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128833687,Hpt_Guardian_GaussCannon_Fixed_Medium,hardpoint,Guardian Gauss Cannon,Fixed,,,2,B,ELITE_HORIZONS_V_GUARDIAN_GAUSS_FIXED_MEDIUM +128833944,Int_CorrosionProofCargoRack_Size4_Class1,internal,Corrosion Resistant Cargo Rack,,,,4,E,ELITE_HORIZONS_V_CORROSIONCARGO_SIZE4 +128833945,Int_GuardianHullReinforcement_Size1_Class1,internal,Guardian Hull Reinforcement,,,,1,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833946,Int_GuardianHullReinforcement_Size1_Class2,internal,Guardian Hull Reinforcement,,,,1,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833947,Int_GuardianHullReinforcement_Size2_Class1,internal,Guardian Hull Reinforcement,,,,2,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833948,Int_GuardianHullReinforcement_Size2_Class2,internal,Guardian Hull Reinforcement,,,,2,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833949,Int_GuardianHullReinforcement_Size3_Class1,internal,Guardian Hull Reinforcement,,,,3,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833950,Int_GuardianHullReinforcement_Size3_Class2,internal,Guardian Hull Reinforcement,,,,3,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833951,Int_GuardianHullReinforcement_Size4_Class1,internal,Guardian Hull Reinforcement,,,,4,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833952,Int_GuardianHullReinforcement_Size4_Class2,internal,Guardian Hull Reinforcement,,,,4,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833953,Int_GuardianHullReinforcement_Size5_Class1,internal,Guardian Hull Reinforcement,,,,5,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833954,Int_GuardianHullReinforcement_Size5_Class2,internal,Guardian Hull Reinforcement,,,,5,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT +128833955,Int_GuardianModuleReinforcement_Size1_Class1,internal,Guardian Module Reinforcement,,,,1,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833956,Int_GuardianModuleReinforcement_Size1_Class2,internal,Guardian Module Reinforcement,,,,1,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833957,Int_GuardianModuleReinforcement_Size2_Class1,internal,Guardian Module Reinforcement,,,,2,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833958,Int_GuardianModuleReinforcement_Size2_Class2,internal,Guardian Module Reinforcement,,,,2,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833959,Int_GuardianModuleReinforcement_Size3_Class1,internal,Guardian Module Reinforcement,,,,3,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833960,Int_GuardianModuleReinforcement_Size3_Class2,internal,Guardian Module Reinforcement,,,,3,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833961,Int_GuardianModuleReinforcement_Size4_Class1,internal,Guardian Module Reinforcement,,,,4,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833962,Int_GuardianModuleReinforcement_Size4_Class2,internal,Guardian Module Reinforcement,,,,4,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833963,Int_GuardianModuleReinforcement_Size5_Class1,internal,Guardian Module Reinforcement,,,,5,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833964,Int_GuardianModuleReinforcement_Size5_Class2,internal,Guardian Module Reinforcement,,,,5,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT +128833965,Int_GuardianShieldReinforcement_Size1_Class1,internal,Guardian Shield Reinforcement,,,,1,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833966,Int_GuardianShieldReinforcement_Size1_Class2,internal,Guardian Shield Reinforcement,,,,1,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833967,Int_GuardianShieldReinforcement_Size2_Class1,internal,Guardian Shield Reinforcement,,,,2,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833968,Int_GuardianShieldReinforcement_Size2_Class2,internal,Guardian Shield Reinforcement,,,,2,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833969,Int_GuardianShieldReinforcement_Size3_Class1,internal,Guardian Shield Reinforcement,,,,3,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833970,Int_GuardianShieldReinforcement_Size3_Class2,internal,Guardian Shield Reinforcement,,,,3,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833971,Int_GuardianShieldReinforcement_Size4_Class1,internal,Guardian Shield Reinforcement,,,,4,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833972,Int_GuardianShieldReinforcement_Size4_Class2,internal,Guardian Shield Reinforcement,,,,4,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833973,Int_GuardianShieldReinforcement_Size5_Class1,internal,Guardian Shield Reinforcement,,,,5,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833974,Int_GuardianShieldReinforcement_Size5_Class2,internal,Guardian Shield Reinforcement,,,,5,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT +128833975,Int_GuardianFSDBooster_Size1,internal,Guardian FSD Booster,,,,1,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER +128833976,Int_GuardianFSDBooster_Size2,internal,Guardian FSD Booster,,,,2,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER +128833977,Int_GuardianFSDBooster_Size3,internal,Guardian FSD Booster,,,,3,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER +128833978,Int_GuardianFSDBooster_Size4,internal,Guardian FSD Booster,,,,4,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER +128833979,Int_GuardianFSDBooster_Size5,internal,Guardian FSD Booster,,,,5,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER +128833980,Int_GuardianPowerDistributor_Size1,internal,Guardian Hybrid Power Distributor,,,,1,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833981,Int_GuardianPowerDistributor_Size2,internal,Guardian Hybrid Power Distributor,,,,2,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833982,Int_GuardianPowerDistributor_Size3,internal,Guardian Hybrid Power Distributor,,,,3,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833983,Int_GuardianPowerDistributor_Size4,internal,Guardian Hybrid Power Distributor,,,,4,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833984,Int_GuardianPowerDistributor_Size5,internal,Guardian Hybrid Power Distributor,,,,5,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833985,Int_GuardianPowerDistributor_Size6,internal,Guardian Hybrid Power Distributor,,,,6,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833986,Int_GuardianPowerDistributor_Size7,internal,Guardian Hybrid Power Distributor,,,,7,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833987,Int_GuardianPowerDistributor_Size8,internal,Guardian Hybrid Power Distributor,,,,8,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR +128833988,Int_GuardianPowerplant_Size2,internal,Guardian Hybrid Power Plant,,,,2,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT +128833989,Int_GuardianPowerplant_Size3,internal,Guardian Hybrid Power Plant,,,,3,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT +128833990,Int_GuardianPowerplant_Size4,internal,Guardian Hybrid Power Plant,,,,4,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT +128833991,Int_GuardianPowerplant_Size5,internal,Guardian Hybrid Power Plant,,,,5,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT +128833992,Int_GuardianPowerplant_Size6,internal,Guardian Hybrid Power Plant,,,,6,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT +128833993,Int_GuardianPowerplant_Size7,internal,Guardian Hybrid Power Plant,,,,7,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT +128833994,Int_GuardianPowerplant_Size8,internal,Guardian Hybrid Power Plant,,,,8,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT +128833995,Hpt_CausticMissile_Fixed_Medium,hardpoint,Enzyme Missile Rack,Fixed,Dumbfire,,2,B,ELITE_HORIZONS_V_CAUSTIC_MEDIUM +128833996,Hpt_FlechetteLauncher_Fixed_Medium,hardpoint,Remote Release Flechette Launcher,Fixed,,,2,B,ELITE_HORIZONS_V_FLECHETTE_FIXED_MEDIUM +128833997,Hpt_FlechetteLauncher_Turret_Medium,hardpoint,Remote Release Flechette Launcher,Turreted,,,2,B,ELITE_HORIZONS_V_FLECHETTE_TURRET_MEDIUM +128833998,Hpt_Guardian_PlasmaLauncher_Fixed_Medium,hardpoint,Guardian Plasma Charger,Fixed,,,2,B,ELITE_HORIZONS_V_GUARDIAN_PLASMA_FIXED_MEDIUM +128833999,Hpt_Guardian_PlasmaLauncher_Turret_Medium,hardpoint,Guardian Plasma Charger,Turreted,,,2,E,ELITE_HORIZONS_V_GUARDIAN_PLASMA_TURRET_MEDIUM +128834000,Hpt_Guardian_ShardCannon_Fixed_Medium,hardpoint,Guardian Shard Cannon,Fixed,,,2,A,ELITE_HORIZONS_V_GUARDIAN_SHARD_FIXED_MEDIUM +128834001,Hpt_Guardian_ShardCannon_Turret_medium,hardpoint,Guardian Shard Cannon,Turreted,,,2,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_MEDIUM +128834002,Hpt_PlasmaShockCannon_Fixed_Medium,hardpoint,Shock Cannon,Fixed,,,2,D,ELITE_HORIZONS_V_PLASMASHOCK_FIXED_MEDIUM +128834003,Hpt_PlasmaShockCannon_Gimbal_Medium,hardpoint,Shock Cannon,Gimballed,,,2,D,ELITE_HORIZONS_V_PLASMASHOCK_GIMBAL_MEDIUM +128834004,Hpt_PlasmaShockCannon_Turret_Medium,hardpoint,Shock Cannon,Turreted,,,2,E,ELITE_HORIZONS_V_PLASMASHOCK_TURRET_MEDIUM +128834778,Hpt_Guardian_ShardCannon_Fixed_Large,hardpoint,Guardian Shard Cannon,Fixed,,,3,C,ELITE_HORIZONS_V_GUARDIAN_SHARD_FIXED_LARGE +128834779,Hpt_Guardian_ShardCannon_Turret_Large,hardpoint,Guardian Shard Cannon,Turreted,,,3,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_LARGE +128834780,Hpt_PlasmaShockCannon_Fixed_Large,hardpoint,Shock Cannon,Fixed,,,3,C,ELITE_HORIZONS_V_PLASMASHOCK_FIXED_LARGE +128834781,Hpt_PlasmaShockCannon_Gimbal_Large,hardpoint,Shock Cannon,Gimballed,,,3,C,ELITE_HORIZONS_V_PLASMASHOCK_GIMBAL_LARGE +128834782,Hpt_PlasmaShockCannon_Turret_Large,hardpoint,Shock Cannon,Turreted,,,3,D,ELITE_HORIZONS_V_PLASMASHOCK_TURRET_LARGE +128834783,Hpt_Guardian_PlasmaLauncher_Fixed_Large,hardpoint,Guardian Plasma Charger,Fixed,,,3,C,ELITE_HORIZONS_V_GUARDIAN_PLASMA_FIXED_LARGE +128834784,Hpt_Guardian_PlasmaLauncher_Turret_Large,hardpoint,Guardian Plasma Charger,Turreted,,,3,D,ELITE_HORIZONS_V_GUARDIAN_PLASMA_TURRET_LARGE +128837858,Int_DroneControl_Recon_Size1_Class1,internal,Recon Limpet Controller,,,,1,E, +128839283,Krait_Light_Armour_Grade1,standard,Lightweight Alloy,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128839284,Krait_Light_Armour_Grade2,standard,Reinforced Alloy,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128839285,Krait_Light_Armour_Grade3,standard,Military Grade Composite,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128839286,Krait_Light_Armour_Mirrored,standard,Mirrored Surface Composite,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128839287,Krait_Light_Armour_Reactive,standard,Reactive Surface Composite,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128841592,Int_DroneControl_Recon_Size3_Class1,internal,Recon Limpet Controller,,,,3,E, +128841593,Int_DroneControl_Recon_Size5_Class1,internal,Recon Limpet Controller,,,,5,E, +128841594,Int_DroneControl_Recon_Size7_Class1,internal,Recon Limpet Controller,,,,7,E, +128891602,Hpt_DumbfireMissileRack_Fixed_Large,hardpoint,Missile Rack,Fixed,Dumbfire,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128891603,Hpt_PlasmaShockCannon_Turret_Small,hardpoint,Shock Cannon,Turreted,,,1,F,ELITE_HORIZONS_V_PLASMASHOCK_TURRET_SMALL +128891604,Hpt_PlasmaShockCannon_Gimbal_Small,hardpoint,Shock Cannon,Gimballed,,,1,E,ELITE_HORIZONS_V_PLASMASHOCK_GIMBAL_SMALL +128891605,Hpt_PlasmaShockCannon_Fixed_Small,hardpoint,Shock Cannon,Fixed,,,1,D,ELITE_HORIZONS_V_PLASMASHOCK_FIXED_SMALL +128891606,Hpt_Guardian_PlasmaLauncher_Turret_Small,hardpoint,Guardian Plasma Charger,Turreted,,,1,F,ELITE_HORIZONS_V_GUARDIAN_PLASMA_TURRET_SMALL +128891607,Hpt_Guardian_PlasmaLauncher_Fixed_Small,hardpoint,Guardian Plasma Charger,Fixed,,,1,D,ELITE_HORIZONS_V_GUARDIAN_PLASMA_FIXED_SMALL +128891608,Hpt_Guardian_ShardCannon_Turret_Small,hardpoint,Guardian Shard Cannon,Turreted,,,1,F,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_SMALL +128891609,Hpt_Guardian_ShardCannon_Fixed_Small,hardpoint,Guardian Shard Cannon,Fixed,,,1,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_FIXED_SMALL +128891610,Hpt_Guardian_GaussCannon_Fixed_Small,hardpoint,Guardian Gauss Cannon,Fixed,,,1,D,ELITE_HORIZONS_V_GUARDIAN_GAUSS_FIXED_SMALL +128915454,Hpt_Mining_SubSurfDispMisle_Fixed_Small,hardpoint,Sub-Surface Displacement Missile,Fixed,Seeker,,1,B, +128915455,Hpt_Mining_SubSurfDispMisle_Turret_Small,hardpoint,Sub-Surface Displacement Missile,Turreted,Seeker,,1,B, +128915456,Hpt_Mining_SubSurfDispMisle_Fixed_Medium,hardpoint,Sub-Surface Displacement Missile,Fixed,Seeker,,2,B, +128915457,Hpt_Mining_SubSurfDispMisle_Turret_Medium,hardpoint,Sub-Surface Displacement Missile,Turreted,Seeker,,2,B, +128915458,Hpt_Mining_AbrBlstr_Fixed_Small,hardpoint,Abrasion Blaster,Fixed,,,1,D, +128915459,Hpt_Mining_AbrBlstr_Turret_Small,hardpoint,Abrasion Blaster,Turreted,,,1,D, +128915460,Hpt_Mining_SeismChrgWarhd_Fixed_Medium,hardpoint,Seismic Charge Launcher,Fixed,Seeker,,2,B, +128915461,Hpt_Mining_SeismChrgWarhd_Turret_Medium,hardpoint,Seismic Charge Launcher,Turreted,Seeker,,2,B, +128915718,Hpt_MRAScanner_Size0_Class1,utility,Pulse Wave Analyser,,,,0,E, +128915719,Hpt_MRAScanner_Size0_Class2,utility,Pulse Wave Analyser,,,,0,D, +128915720,Hpt_MRAScanner_Size0_Class3,utility,Pulse Wave Analyser,,,,0,C, +128915721,Hpt_MRAScanner_Size0_Class4,utility,Pulse Wave Analyser,,,,0,B, +128915722,Hpt_MRAScanner_Size0_Class5,utility,Pulse Wave Analyser,,,,0,A, +128915981,Mamba_Armour_Grade1,standard,Lightweight Alloy,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128915982,Mamba_Armour_Grade2,standard,Reinforced Alloy,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128915983,Mamba_Armour_Grade3,standard,Military Grade Composite,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128915984,Mamba_Armour_Mirrored,standard,Mirrored Surface Composite,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128915985,Mamba_Armour_Reactive,standard,Reactive Surface Composite,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +128932273,Int_SupercruiseAssist,internal,Supercruise Assist,,,,1,E, +128935155,Int_DockingComputer_Advanced,internal,Advanced Docking Computer,,,,1,E, +128935980,Hpt_MultiCannon_Fixed_Medium_Advanced,hardpoint,Advanced Multi-Cannon,Fixed,,,2,E, +128935981,Hpt_MultiCannon_Fixed_Small_Advanced,hardpoint,Advanced Multi-Cannon,Fixed,,,1,F, +128935982,Hpt_DumbfireMissileRack_Fixed_Small_Advanced,hardpoint,Advanced Missile Rack,Fixed,Dumbfire,,1,B, +128935983,Hpt_DumbfireMissileRack_Fixed_Medium_Advanced,hardpoint,Advanced Missile Rack,Fixed,Dumbfire,,2,B, +128975719,Int_PlanetApproachSuite_Advanced,internal,Advanced Planetary Approach Suite,,,,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS +129001921,Int_MultiDroneControl_Mining_Size3_Class1,internal,Mining Multi Limpet Controller,,,,3,E, +129001922,Int_MultiDroneControl_Mining_Size3_Class3,internal,Mining Multi Limpet Controller,,,,3,C, +129001923,Int_MultiDroneControl_Operations_Size3_Class3,internal,Operations Multi Limpet Controller,,,,3,C, +129001924,Int_MultiDroneControl_Operations_Size3_Class4,internal,Operations Multi Limpet Controller,,,,3,B, +129001925,Int_MultiDroneControl_Rescue_Size3_Class2,internal,Rescue Multi Limpet Controller,,,,3,D, +129001926,Int_MultiDroneControl_Rescue_Size3_Class3,internal,Rescue Multi Limpet Controller,,,,3,C, +129001927,Int_MultiDroneControl_Xeno_Size3_Class3,internal,Xeno Multi Limpet Controller,,,,3,C, +129001928,Int_MultiDroneControl_Xeno_Size3_Class4,internal,Xeno Multi Limpet Controller,,,,3,B, +129001929,Int_MultiDroneControl_Universal_Size7_Class3,internal,Universal Multi Limpet Controller,,,,7,C, +129001930,Int_MultiDroneControl_Universal_Size7_Class5,internal,Universal Multi Limpet Controller,,,,7,A, From 5c26501d8c7fe3f1bdcec798afca5aebe14a4dd2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 13:24:23 +0000 Subject: [PATCH 253/527] Update outfitting.csv & rare_commodity.csv to very latest FDevIDs A pending 'Update 9' PR hadn't been merged to FDevIDs --- outfitting.csv | 2 +- rare_commodity.csv | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/outfitting.csv b/outfitting.csv index 0b746901..02955d21 100644 --- a/outfitting.csv +++ b/outfitting.csv @@ -1003,7 +1003,7 @@ id,symbol,category,name,mount,guidance,ship,class,rating,entitlement 128833998,Hpt_Guardian_PlasmaLauncher_Fixed_Medium,hardpoint,Guardian Plasma Charger,Fixed,,,2,B,ELITE_HORIZONS_V_GUARDIAN_PLASMA_FIXED_MEDIUM 128833999,Hpt_Guardian_PlasmaLauncher_Turret_Medium,hardpoint,Guardian Plasma Charger,Turreted,,,2,E,ELITE_HORIZONS_V_GUARDIAN_PLASMA_TURRET_MEDIUM 128834000,Hpt_Guardian_ShardCannon_Fixed_Medium,hardpoint,Guardian Shard Cannon,Fixed,,,2,A,ELITE_HORIZONS_V_GUARDIAN_SHARD_FIXED_MEDIUM -128834001,Hpt_Guardian_ShardCannon_Turret_medium,hardpoint,Guardian Shard Cannon,Turreted,,,2,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_MEDIUM +128834001,Hpt_Guardian_ShardCannon_Turret_Medium,hardpoint,Guardian Shard Cannon,Turreted,,,2,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_MEDIUM 128834002,Hpt_PlasmaShockCannon_Fixed_Medium,hardpoint,Shock Cannon,Fixed,,,2,D,ELITE_HORIZONS_V_PLASMASHOCK_FIXED_MEDIUM 128834003,Hpt_PlasmaShockCannon_Gimbal_Medium,hardpoint,Shock Cannon,Gimballed,,,2,D,ELITE_HORIZONS_V_PLASMASHOCK_GIMBAL_MEDIUM 128834004,Hpt_PlasmaShockCannon_Turret_Medium,hardpoint,Shock Cannon,Turreted,,,2,E,ELITE_HORIZONS_V_PLASMASHOCK_TURRET_MEDIUM diff --git a/rare_commodity.csv b/rare_commodity.csv index d8752d3f..d0d7397f 100644 --- a/rare_commodity.csv +++ b/rare_commodity.csv @@ -140,3 +140,4 @@ id,symbol,market_id,category,name 128913661,Nanomedicines,3226651904,Medicines,Nanomedicines 128922524,Duradrives,3223453184,Consumer Items,Duradrives 128958679,ApaVietii,128958681,Legal Drugs,Apa Vietii +129002574,ClassifiedExperimentalEquipment,128986325,Technology,Classified Experimental Equipment From d8b29e45b86f36ab3cf540ec1503b9170a8505de Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 13:44:20 +0000 Subject: [PATCH 254/527] Release 5.2.4: appversion & changelog --- ChangeLog.md | 16 ++++++++++++++++ config.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9bdc3ad7..8906e51c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,22 @@ produce the Windows executables and installer. --- +Release 5.2.4 +=== +This is a *very* minor update that simply imports the latest versions of +data files so that some niche functionality works properly. + +* Update `commodity.csv` and `rare_commodity.csv` from the latest + [EDCD/FDevIDs](https://github.com/EDCD/FDevIDs) versions. This addresses + an issue with export of market data in Trade Dangerous format containing + `OnionHeadC` rather than the correct name, `Onionhead Gamma Strain`, that + Trade Dangerous is expecting. + + This will only have affected Trade Dangerous users who use EDMarketConnector + as a source of market data. + +--- + Release 5.2.3 === diff --git a/config.py b/config.py index 22663eab..6b08108f 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.2.3' +_static_appversion = '5.2.4' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' From 8bae11c84b798a6b1d5680dff75a37206d10bd9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 17:03:58 +0000 Subject: [PATCH 255/527] build(deps-dev): bump lxml from 4.6.4 to 4.7.1 Bumps [lxml](https://github.com/lxml/lxml) from 4.6.4 to 4.7.1. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.4...lxml-4.7.1) --- updated-dependencies: - dependency-name: lxml dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 221b5997..a0931b9c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -28,7 +28,7 @@ grip==4.5.2 # Packaging # Used to put together a WiX configuration from template/auto-gen -lxml==4.6.4 +lxml==4.7.1 # We only need py2exe on windows. py2exe==0.11.0.1; sys_platform == 'win32' From becdd8ce83e0c96b4d4cfa46567fed483e37a586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 17:04:07 +0000 Subject: [PATCH 256/527] build(deps-dev): bump mypy from 0.910 to 0.920 Bumps [mypy](https://github.com/python/mypy) from 0.910 to 0.920. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.910...v0.920) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 221b5997..7da3ad36 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,7 +15,7 @@ flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.910 +mypy==0.920 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.26.1 From 096b41fa844a82d2011610029f0e0e4cffad587e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 16 Dec 2021 17:34:46 +0000 Subject: [PATCH 257/527] fdevids: Add FDevIDs repo as a submodule --- .gitmodules | 3 +++ FDevIDs | 1 + 2 files changed, 4 insertions(+) create mode 160000 FDevIDs diff --git a/.gitmodules b/.gitmodules index 134d60e0..b844f49e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "coriolis-data"] path = coriolis-data url = git@github.com:EDCD/coriolis-data.git +[submodule "FDevIDs"] + path = FDevIDs + url = https://github.com/EDCD/FDevIDs.git diff --git a/FDevIDs b/FDevIDs new file mode 160000 index 00000000..f4677fff --- /dev/null +++ b/FDevIDs @@ -0,0 +1 @@ +Subproject commit f4677fffe618439e4111b97154c4592fe4f360e9 From bcabd97f4cb623d5f5b375482ae59821168e552d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 11:08:14 +0000 Subject: [PATCH 258/527] FDevIDs: Switch code to using FDevIDs/ files --- collate.py | 3 ++- companion.py | 3 +-- setup.py | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/collate.py b/collate.py index a47b4a45..5ba0731a 100755 --- a/collate.py +++ b/collate.py @@ -4,6 +4,7 @@ import csv import json import os +import pathlib import sys from os.path import isfile from traceback import print_exc @@ -38,7 +39,7 @@ def addcommodities(data) -> None: # noqa: CCR001 if not data['lastStarport'].get('commodities'): return - commodityfile = 'commodity.csv' + commodityfile = pathlib.Path('FDevIDs/commodity.csv') commodities = {} # slurp existing diff --git a/companion.py b/companion.py index 9a175a1d..91b306e3 100644 --- a/companion.py +++ b/companion.py @@ -22,7 +22,6 @@ import urllib.parse import webbrowser from builtins import object, range, str from email.utils import parsedate -from os.path import join from queue import Queue from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, OrderedDict, TypeVar, Union @@ -1065,7 +1064,7 @@ def fixup(data: CAPIData) -> CAPIData: # noqa: C901, CCR001 # Can't be usefully if not commodity_map: # Lazily populate for f in ('commodity.csv', 'rare_commodity.csv'): - with open(join(config.respath_path, f), 'r') as csvfile: + with open(config.respath_path / 'FDevIDs' / f, 'r') as csvfile: reader = csv.DictReader(csvfile) for row in reader: diff --git a/setup.py b/setup.py index 8bb8fb30..4a9ed68d 100755 --- a/setup.py +++ b/setup.py @@ -144,8 +144,10 @@ if sys.platform == 'darwin': ('plugins', x) for x in PLUGINS ], 'resources': [ - 'commodity.csv', - 'rare_commodity.csv', + '.gitversion', # Contains git short hash + 'ChangeLog.md', + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', @@ -213,8 +215,8 @@ elif sys.platform == 'win32': 'WinSparkle.pdb', # For debugging - don't include in package 'EUROCAPS.TTF', 'ChangeLog.md', - 'commodity.csv', - 'rare_commodity.csv', + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', From 33844126329c3c95c26a87fa495e75953ba79c07 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 11:12:55 +0000 Subject: [PATCH 259/527] collapre.py: flake8/mypy fixups --- collate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/collate.py b/collate.py index 5ba0731a..0350485f 100755 --- a/collate.py +++ b/collate.py @@ -14,14 +14,14 @@ import outfitting from edmc_data import companion_category_map, ship_name_map -def __make_backup(file_name: str, suffix: str = '.bak') -> None: +def __make_backup(file_name: pathlib.Path, suffix: str = '.bak') -> None: """ Rename the given file to $file.bak, removing any existing $file.bak. Assumes $file exists on disk. :param file_name: The name of the file to make a backup of :param suffix: The suffix to use for backup files (default '.bak') """ - backup_name = file_name + suffix + backup_name = file_name.parent / (file_name.name + suffix) if isfile(backup_name): os.unlink(backup_name) @@ -150,7 +150,7 @@ def addships(data) -> None: # noqa: CCR001 if not data['lastStarport'].get('ships'): return - shipfile = 'shipyard.csv' + shipfile = pathlib.Path('shipyard.csv') ships = {} fields = ('id', 'symbol', 'name') From 1d3ff006cd5bc5e2b04734676527b2621e852de7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 11:35:00 +0000 Subject: [PATCH 260/527] collate.py: Correction so it works with dump/ files And adjust the dile docstring to point out it will only work with the dump/ file format, not the new 'File > Save Raw Data' one. --- collate.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/collate.py b/collate.py index 0350485f..d789a6c5 100755 --- a/collate.py +++ b/collate.py @@ -1,5 +1,11 @@ #!/usr/bin/env python3 -"""Collate lists of seen commodities, modules and ships from dumps of the Companion API output.""" +""" +Collate lists of seen commodities, modules and ships from dumps of the Companion API output. + +Note that currently this will only work with the output files created if you +run the main program from a working directory that has a `dump/` directory, +which causes a file to be written per CAPI query. +""" import csv import json @@ -210,6 +216,7 @@ if __name__ == "__main__": with open(file_name) as f: print(file_name) data = json.load(f) + data = data['data'] if not data['commander'].get('docked'): print('Not docked!') From 77e89a9df15ea76d02e728781ea64f4058352627 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 12:00:49 +0000 Subject: [PATCH 261/527] setup.py: Properly include FDevIDs files I have my doubts about the darwin section, but we never package for it any more, so I'm not going to worry about it now. --- setup.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 4a9ed68d..f73dc370 100755 --- a/setup.py +++ b/setup.py @@ -146,12 +146,14 @@ if sys.platform == 'darwin': 'resources': [ '.gitversion', # Contains git short hash 'ChangeLog.md', - join('FDevIDs', 'commodity.csv'), - join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', 'ships.p', + ('FDevIDs', [ + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), + ]), ], 'site_packages': False, 'plist': { @@ -215,8 +217,6 @@ elif sys.platform == 'win32': 'WinSparkle.pdb', # For debugging - don't include in package 'EUROCAPS.TTF', 'ChangeLog.md', - join('FDevIDs', 'commodity.csv'), - join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', @@ -228,6 +228,10 @@ elif sys.platform == 'win32': 'EDMarketConnector - reset-ui.bat', ]), ('L10n', [join('L10n', x) for x in os.listdir('L10n') if x.endswith('.strings')]), + ('FDevIDs', [ + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), + ]), ('plugins', PLUGINS), ] From c45b99a1804270540c2111a4a510a12ed56d4f28 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 12:17:07 +0000 Subject: [PATCH 262/527] Remove local copies of (rare_)commodity.csv in favour of FDevIDs versions NB: Keeping the local outfitting.csv for now due to how it's used (both input and output in collate.py, input in coriolis.py). --- commodity.csv | 220 --------------------------------------------- rare_commodity.csv | 139 ---------------------------- 2 files changed, 359 deletions(-) delete mode 100644 commodity.csv delete mode 100644 rare_commodity.csv diff --git a/commodity.csv b/commodity.csv deleted file mode 100644 index eb7084a3..00000000 --- a/commodity.csv +++ /dev/null @@ -1,220 +0,0 @@ -id,symbol,category,name -128049152,Platinum,Metals,Platinum -128049153,Palladium,Metals,Palladium -128049154,Gold,Metals,Gold -128049155,Silver,Metals,Silver -128049156,Bertrandite,Minerals,Bertrandite -128049157,Indite,Minerals,Indite -128049158,Gallite,Minerals,Gallite -128049159,Coltan,Minerals,Coltan -128049160,Uraninite,Minerals,Uraninite -128049161,Lepidolite,Minerals,Lepidolite -128049162,Cobalt,Metals,Cobalt -128049163,Rutile,Minerals,Rutile -128049165,Bauxite,Minerals,Bauxite -128049166,Water,Chemicals,Water -128049168,Beryllium,Metals,Beryllium -128049169,Indium,Metals,Indium -128049170,Gallium,Metals,Gallium -128049171,Tantalum,Metals,Tantalum -128049172,Uranium,Metals,Uranium -128049173,Lithium,Metals,Lithium -128049174,Titanium,Metals,Titanium -128049175,Copper,Metals,Copper -128049176,Aluminium,Metals,Aluminium -128049177,Algae,Foods,Algae -128049178,FruitAndVegetables,Foods,Fruit and Vegetables -128049180,Grain,Foods,Grain -128049182,Animalmeat,Foods,Animal Meat -128049183,Fish,Foods,Fish -128049184,FoodCartridges,Foods,Food Cartridges -128049185,SyntheticMeat,Foods,Synthetic Meat -128049188,Tea,Foods,Tea -128049189,Coffee,Foods,Coffee -128049190,Leather,Textiles,Leather -128049191,NaturalFabrics,Textiles,Natural Fabrics -128049193,SyntheticFabrics,Textiles,Synthetic Fabrics -128049197,Polymers,Industrial Materials,Polymers -128049199,Semiconductors,Industrial Materials,Semiconductors -128049200,Superconductors,Industrial Materials,Superconductors -128049202,HydrogenFuel,Chemicals,Hydrogen Fuel -128049203,MineralOil,Chemicals,Mineral Oil -128049204,Explosives,Chemicals,Explosives -128049205,Pesticides,Chemicals,Pesticides -128049208,AgriculturalMedicines,Medicines,Agri-Medicines -128049209,PerformanceEnhancers,Medicines,Performance Enhancers -128049210,BasicMedicines,Medicines,Basic Medicines -128049212,BasicNarcotics,Legal Drugs,Narcotics -128049213,Tobacco,Legal Drugs,Tobacco -128049214,Beer,Legal Drugs,Beer -128049215,Wine,Legal Drugs,Wine -128049216,Liquor,Legal Drugs,Liquor -128049217,PowerGenerators,Machinery,Power Generators -128049218,WaterPurifiers,Machinery,Water Purifiers -128049220,HeliostaticFurnaces,Machinery,Microbial Furnaces -128049221,MineralExtractors,Machinery,Mineral Extractors -128049222,CropHarvesters,Machinery,Crop Harvesters -128049223,MarineSupplies,Machinery,Marine Equipment -128049225,ComputerComponents,Technology,Computer Components -128049226,HazardousEnvironmentSuits,Technology,H.E. Suits -128049227,Robotics,Technology,Robotics -128049228,AutoFabricators,Technology,Auto-Fabricators -128049229,AnimalMonitors,Technology,Animal Monitors -128049230,AquaponicSystems,Technology,Aquaponic Systems -128049231,AdvancedCatalysers,Technology,Advanced Catalysers -128049232,TerrainEnrichmentSystems,Technology,Land Enrichment Systems -128049233,PersonalWeapons,Weapons,Personal Weapons -128049234,BattleWeapons,Weapons,Battle Weapons -128049235,ReactiveArmour,Weapons,Reactive Armour -128049236,NonLethalWeapons,Weapons,Non-Lethal Weapons -128049238,DomesticAppliances,Consumer Items,Domestic Appliances -128049240,ConsumerTechnology,Consumer Items,Consumer Technology -128049241,Clothing,Consumer Items,Clothing -128049243,Slaves,Slavery,Slaves -128049244,Biowaste,Waste,Biowaste -128049245,ToxicWaste,Waste,Toxic Waste -128049246,ChemicalWaste,Waste,Chemical Waste -128049248,Scrap,Waste,Scrap -128049669,ProgenitorCells,Medicines,Progenitor Cells -128049670,CombatStabilisers,Medicines,Combat Stabilisers -128049671,ResonatingSeparators,Technology,Resonating Separators -128049672,BioReducingLichen,Technology,Bioreducing Lichen -128064028,AtmosphericExtractors,Machinery,Atmospheric Processors -128066403,Drones,NonMarketable,Limpets -128666752,USSCargoBlackBox,Salvage,Black Box -128666754,USSCargoTradeData,Salvage,Trade Data -128666755,USSCargoMilitaryPlans,Salvage,Military Plans -128666756,USSCargoAncientArtefact,Salvage,Ancient Artefact -128666757,USSCargoRareArtwork,Salvage,Rare Artwork -128666758,USSCargoExperimentalChemicals,Salvage,Experimental Chemicals -128666759,USSCargoRebelTransmissions,Salvage,Rebel Transmissions -128666760,USSCargoPrototypeTech,Salvage,Prototype Tech -128666761,USSCargoTechnicalBlueprints,Salvage,Technical Blueprints -128667728,ImperialSlaves,Slavery,Imperial Slaves -128668547,UnknownArtifact,Salvage,Thargoid Sensor -128668548,AiRelics,Salvage,AI Relics -128668549,Hafnium178,Metals,Hafnium 178 -128668550,Painite,Minerals,Painite -128668551,Antiquities,Salvage,Antiquities -128668552,MilitaryIntelligence,Salvage,Military Intelligence -128671118,Osmium,Metals,Osmium -128671443,SAP8CoreContainer,Salvage,SAP 8 Core Container -128671444,TrinketsOfFortune,Consumer Items,Trinkets of Hidden Fortune -128672123,WreckageComponents,Salvage,Wreckage Components -128672124,EncriptedDataStorage,Salvage,Encrypted Data Storage -128672125,OccupiedCryoPod,Salvage,Occupied Escape Pod -128672126,PersonalEffects,Salvage,Personal Effects -128672127,ComercialSamples,Salvage,Commercial Samples -128672128,TacticalData,Salvage,Tactical Data -128672129,AssaultPlans,Salvage,Assault Plans -128672130,EncryptedCorrespondence,Salvage,Encrypted Correspondence -128672131,DiplomaticBag,Salvage,Diplomatic Bag -128672132,ScientificResearch,Salvage,Scientific Research -128672133,ScientificSamples,Salvage,Scientific Samples -128672134,PoliticalPrisoner,Salvage,Political Prisoners -128672135,Hostage,Salvage,Hostages -128672136,LargeExplorationDataCash,Salvage,Large Survey Data Cache -128672137,SmallExplorationDataCash,Salvage,Small Survey Data Cache -128672159,AntiqueJewellery,Salvage,Antique Jewellery -128672160,PreciousGems,Salvage,Precious Gems -128672161,EarthRelics,Salvage,Earth Relics -128672162,GeneBank,Salvage,Gene Bank -128672163,TimeCapsule,Salvage,Time Capsule -128672294,Cryolite,Minerals,Cryolite -128672295,Goslarite,Minerals,Goslarite -128672296,Moissanite,Minerals,Moissanite -128672297,Pyrophyllite,Minerals,Pyrophyllite -128672298,Lanthanum,Metals,Lanthanum -128672299,Thallium,Metals,Thallium -128672300,Bismuth,Metals,Bismuth -128672301,Thorium,Metals,Thorium -128672302,CeramicComposites,Industrial Materials,Ceramic Composites -128672303,SyntheticReagents,Chemicals,Synthetic Reagents -128672304,NerveAgents,Chemicals,Nerve Agents -128672305,SurfaceStabilisers,Chemicals,Surface Stabilisers -128672306,BootlegLiquor,Legal Drugs,Bootleg Liquor -128672307,GeologicalEquipment,Machinery,Geological Equipment -128672308,ThermalCoolingUnits,Machinery,Thermal Cooling Units -128672309,BuildingFabricators,Machinery,Building Fabricators -128672310,MuTomImager,Technology,Muon Imager -128672311,StructuralRegulators,Technology,Structural Regulators -128672312,Landmines,Weapons,Landmines -128672313,SkimerComponents,Machinery,Skimmer Components -128672314,EvacuationShelter,Consumer Items,Evacuation Shelter -128672315,GeologicalSamples,Salvage,Geological Samples -128672701,MetaAlloys,Industrial Materials,Meta-Alloys -128672775,Taaffeite,Minerals,Taaffeite -128672776,Jadeite,Minerals,Jadeite -128672810,UnstableDataCore,Salvage,Unstable Data Core -128672811,DamagedEscapePod,Salvage,Damaged Escape Pod -128673845,Praseodymium,Metals,Praseodymium -128673846,Bromellite,Minerals,Bromellite -128673847,Samarium,Metals,Samarium -128673848,LowTemperatureDiamond,Minerals,Low Temperature Diamonds -128673850,HydrogenPeroxide,Chemicals,Hydrogen Peroxide -128673851,LiquidOxygen,Chemicals,Liquid oxygen -128673852,MethanolMonohydrateCrystals,Minerals,Methanol Monohydrate Crystals -128673853,LithiumHydroxide,Minerals,Lithium Hydroxide -128673854,MethaneClathrate,Minerals,Methane Clathrate -128673855,InsulatingMembrane,Industrial Materials,Insulating Membrane -128673856,CMMComposite,Industrial Materials,CMM Composite -128673857,CoolingHoses,Industrial Materials,Micro-weave Cooling Hoses -128673858,NeofabricInsulation,Industrial Materials,Neofabric Insulation -128673859,ArticulationMotors,Machinery,Articulation Motors -128673860,HNShockMount,Machinery,HN Shock Mount -128673861,EmergencyPowerCells,Machinery,Emergency Power Cells -128673862,PowerConverter,Machinery,Power Converter -128673863,PowerGridAssembly,Machinery,Energy Grid Assembly -128673864,PowerTransferConduits,Machinery,Power Transfer Bus -128673865,RadiationBaffle,Machinery,Radiation Baffle -128673866,ExhaustManifold,Machinery,Exhaust Manifold -128673867,ReinforcedMountingPlate,Machinery,Reinforced Mounting Plate -128673868,HeatsinkInterlink,Machinery,Heatsink Interlink -128673869,MagneticEmitterCoil,Machinery,Magnetic Emitter Coil -128673870,ModularTerminals,Machinery,Modular Terminals -128673871,Nanobreakers,Technology,Nanobreakers -128673872,TelemetrySuite,Technology,Telemetry Suite -128673873,MicroControllers,Technology,Micro Controllers -128673874,IonDistributor,Machinery,Ion Distributor -128673875,DiagnosticSensor,Technology,Hardware Diagnostic Sensor -128673876,UnknownArtifact2,Salvage,Thargoid Probe -128682044,ConductiveFabrics,Textiles,Conductive Fabrics -128682045,MilitaryGradeFabrics,Textiles,Military Grade Fabrics -128682046,AdvancedMedicines,Medicines,Advanced Medicines -128682047,MedicalDiagnosticEquipment,Technology,Medical Diagnostic Equipment -128682048,SurvivalEquipment,Consumer Items,Survival Equipment -128682049,DataCore,Salvage,Data Core -128682051,MysteriousIdol,Salvage,Mysterious Idol -128682052,ProhibitedResearchMaterials,Salvage,Prohibited Research Materials -128682053,AntimatterContainmentUnit,Salvage,Antimatter Containment Unit -128682054,SpacePioneerRelics,Salvage,Space Pioneer Relics -128682055,FossilRemnants,Salvage,Fossil Remnants -128732183,AncientRelic,Salvage,Ancient Relic -128732184,AncientOrb,Salvage,Ancient Orb -128732185,AncientCasket,Salvage,Ancient Casket -128732186,AncientTablet,Salvage,Ancient Tablet -128732187,AncientUrn,Salvage,Ancient Urn -128732188,AncientTotem,Salvage,Ancient Totem -128737287,UnknownResin,Salvage,Thargoid Resin -128737288,UnknownBiologicalMatter,Salvage,Thargoid Biological Matter -128737289,UnknownTechnologySamples,Salvage,Thargoid Technology Samples -128740752,UnknownArtifact3,Salvage,Thargoid Link -128793127,ThargoidHeart,Salvage,Thargoid Heart -128793128,ThargoidTissueSampleType1,Salvage,Thargoid Cyclops Tissue Sample -128793129,ThargoidTissueSampleType2,Salvage,Thargoid Basilisk Tissue Sample -128793130,ThargoidTissueSampleType3,Salvage,Thargoid Medusa Tissue Sample -128824468,ThargoidScoutTissueSample,Salvage,Thargoid Scout Tissue Sample -128888499,AncientKey,Salvage,Ancient Key -128902652,ThargoidTissueSampleType4,Salvage,Thargoid Hydra Tissue Sample -128913661,Nanomedicines,Medicines,Nanomedicines -128922524,Duradrives,Consumer Items,Duradrives -128924325,Rhodplumsite,Minerals,Rhodplumsite -128924326,Serendibite,Minerals,Serendibite -128924327,Monazite,Minerals,Monazite -128924328,Musgravite,Minerals,Musgravite -128924329,Benitoite,Minerals,Benitoite -128924330,Grandidierite,Minerals,Grandidierite -128924331,Alexandrite,Minerals,Alexandrite -128924332,Opal,Minerals,Void Opal -128924333,RockforthFertiliser,Chemicals,Rockforth Fertiliser -128924334,AgronomicTreatment,Chemicals,Agronomic Treatment diff --git a/rare_commodity.csv b/rare_commodity.csv deleted file mode 100644 index 67b95dbd..00000000 --- a/rare_commodity.csv +++ /dev/null @@ -1,139 +0,0 @@ -id,symbol,market_id,category,name -128666746,EraninPearlWhisky,128001536,Legal Drugs,Eranin Pearl Whisky -128666747,LavianBrandy,128106744,Legal Drugs,Lavian Brandy -128667019,HIP10175BushMeat,3223234816,Foods,HIP 10175 Bush Meat -128667020,AlbinoQuechuaMammoth,3222822912,Foods,Albino Quechua Mammoth Meat -128667021,UtgaroarMillenialEggs,128037120,Foods,Utgaroar Millennial Eggs -128667022,WitchhaulKobeBeef,3223358720,Foods,Witchhaul Kobe Beef -128667023,KarsukiLocusts,3225028096,Foods,Karsuki Locusts -128667024,GiantIrukamaSnails,3225345792,Foods,Giant Irukama Snails -128667025,BaltahSineVacuumKrill,128088056,Foods,Baltah'sine Vacuum Krill -128667026,CetiRabbits,3222560000,Foods,Ceti Rabbits -128667027,KachiriginLeaches,3221595648,Medicines,Kachirigin Filter Leeches -128667028,LyraeWeed,3226417152,Legal Drugs,Lyrae Weed -128667029,OnionHead,128129272,Legal Drugs,Onionhead -128667030,TarachTorSpice,128041984,Legal Drugs,Tarach Spice -128667031,Wolf1301Fesh,128084984,Legal Drugs,Wolf Fesh -128667032,BorasetaniPathogenetics,3229638400,Weapons,Borasetani Pathogenetics -128667033,HIP118311Swarm,3223177472,Weapons,HIP 118311 Swarm -128667034,KonggaAle,3226978048,Legal Drugs,Kongga Ale -128667035,WuthieloKuFroth,3222155776,Legal Drugs,Wuthielo Ku Froth -128667036,AlacarakmoSkinArt,3231373824,Consumer Items,Alacarakmo Skin Art -128667037,EleuThermals,3230624768,Consumer Items,Eleu Thermals -128667038,EshuUmbrellas,3222295552,Consumer Items,Eshu Umbrellas -128667039,KaretiiCouture,3227333120,Consumer Items,Karetii Couture -128667040,NjangariSaddles,3222416896,Consumer Items,Njangari Saddles -128667041,AnyNaCoffee,3229880064,Foods,Any Na Coffee -128667042,CD75CatCoffee,3228566016,Foods,CD-75 Kitten Brand Coffee -128667043,GomanYauponCoffee,3224449792,Foods,Goman Yaupon Coffee -128667044,VolkhabBeeDrones,3227831808,Machinery,Volkhab Bee Drones -128667045,KinagoInstruments,3227394304,Consumer Items,Kinago Violins -128667046,NgunaModernAntiques,3221538304,Consumer Items,Nguna Modern Antiques -128667047,RajukruStoves,3227512320,Consumer Items,Rajukru Multi-Stoves -128667048,TiolceWaste2PasteUnits,3224141312,Consumer Items,Tiolce Waste2Paste Units -128667049,ChiEridaniMarinePaste,128128760,Foods,Chi Eridani Marine Paste -128667050,EsusekuCaviar,3226919680,Foods,Esuseku Caviar -128667051,LiveHecateSeaWorms,128042496,Foods,Live Hecate Sea Worms -128667052,HelvetitjPearls,3231094528,Metals,Helvetitj Pearls -128667053,HIP41181Squid,3227995392,Foods,HIP Proto-Squid -128667054,CoquimSpongiformVictuals,3223832576,Foods,Coquim Spongiform Victuals -128667055,AerialEdenApple,128083448,Foods,Eden Apples of Aerial -128667056,NeritusBerries,3228206080,Foods,Neritus Berries -128667057,OchoengChillies,3226719232,Foods,Ochoeng Chillies -128667058,DeuringasTruffles,3229713408,Foods,Deuringas Truffles -128667059,HR7221Wheat,3226170880,Foods,HR 7221 Wheat -128667060,JarouaRice,3224698112,Foods,Jaroua Rice -128667061,BelalansRayLeather,3223537152,Textiles,Belalans Ray Leather -128667062,DamnaCarapaces,3227751936,Textiles,Damna Carapaces -128667063,RapaBaoSnakeSkins,3222875648,Textiles,Rapa Bao Snake Skins -128667064,VanayequiRhinoFur,3227289856,Textiles,Vanayequi Ceratomorpha Fur -128667065,BastSnakeGin,128086776,Legal Drugs,Bast Snake Gin -128667066,ThrutisCream,3226522368,Legal Drugs,Thrutis Cream -128667067,WulpaHyperboreSystems,3221388032,Machinery,Wulpa Hyperbore Systems -128667068,AganippeRush,128012800,Medicines,Aganippe Rush -128667069,TerraMaterBloodBores,128051466,Medicines,Terra Mater Blood Bores -128667070,HolvaDuellingBlades,3222713088,Weapons,Holva Duelling Blades -128667071,KamorinHistoricWeapons,3221669632,Weapons,Kamorin Historic Weapons -128667072,GilyaSignatureWeapons,3226857216,Weapons,Gilya Signature Weapons -128667073,DeltaPhoenicisPalms,128045312,Chemicals,Delta Phoenicis Palms -128667074,ToxandjiVirocide,3230258688,Chemicals,Toxandji Virocide -128667075,XiheCompanions,3224133120,Technology,Xihe Biomorphic Companions -128667076,SanumaMEAT,3230331136,Foods,Sanuma Decorative Meat -128667077,EthgrezeTeaBuds,3229524992,Foods,Ethgreze Tea Buds -128667078,CeremonialHeikeTea,3227417856,Foods,Ceremonial Heike Tea -128667079,TanmarkTranquilTea,128057866,Foods,Tanmark Tranquil Tea -128667080,AZCancriFormula42,3228400128,Technology,Az Cancri Formula 42 -128667081,KamitraCigars,3225450752,Legal Drugs,Kamitra Cigars -128667082,RusaniOldSmokey,3229255680,Legal Drugs,Rusani Old Smokey -128667083,YasoKondiLeaf,3223088640,Legal Drugs,Yaso Kondi Leaf -128667084,ChateauDeAegaeon,3228416768,Legal Drugs,Chateau De Aegaeon -128667085,WatersOfShintara,128666762,Medicines,The Waters of Shintara -128667668,OphiuchiExinoArtefacts,3228939264,Consumer Items,Ophiuch Exino Artefacts -128667669,BakedGreebles,3229378560,Foods,Baked Greebles -128667670,CetiAepyornisEgg,3222560256,Foods,Aepyornis Egg -128667671,SaxonWine,3227986432,Legal Drugs,Saxon Wine -128667672,CentauriMegaGin,3228728832,Legal Drugs,Centauri Mega Gin -128667673,AnduligaFireWorks,3230243584,Consumer Items,Anduliga Fire Works -128667674,BankiAmphibiousLeather,3228346112,Textiles,Banki Amphibious Leather -128667675,CherbonesBloodCrystals,3229594624,Metals,Cherbones Blood Crystals -128667676,MotronaExperienceJelly,3229750528,Legal Drugs,Motrona Experience Jelly -128667677,GeawenDanceDust,3230954752,Legal Drugs,Geawen Dance Dust -128667678,GerasianGueuzeBeer,3228047360,Legal Drugs,Gerasian Gueuze Beer -128667679,HaidneBlackBrew,3226557696,Foods,Haiden Black Brew -128667680,HavasupaiDreamCatcher,3221438976,Consumer Items,Havasupai Dream Catcher -128667681,BurnhamBileDistillate,3230224384,Legal Drugs,Burnham Bile Distillate -128667682,HIPOrganophosphates,3227036160,Chemicals,HIP Organophosphates -128667683,JaradharrePuzzlebox,3230754816,Consumer Items,Jaradharre Puzzle Box -128667684,KorroKungPellets,3228726272,Chemicals,Koro Kung Pellets -128667685,LFTVoidExtractCoffee,3229028864,Foods,Void Extract Coffee -128667686,HonestyPills,3229561344,Medicines,Honesty Pills -128667687,NonEuclidianExotanks,3224135424,Machinery,Non Euclidian Exotanks -128667688,LTTHyperSweet,3224166400,Foods,LTT Hyper Sweet -128667689,MechucosHighTea,3228398848,Foods,Mechucos High Tea -128667690,MedbStarlube,3228762368,Chemicals,Medb Starlube -128667691,MokojingBeastFeast,3229612800,Foods,Mokojing Beast Feast -128667692,MukusubiiChitinOs,3221719296,Foods,Mukusubii Chitin-os -128667693,MulachiGiantFungus,3228892672,Foods,Mulachi Giant Fungus -128667694,NgadandariFireOpals,3226127872,Metals,Ngadandari Fire Opals -128667695,TiegfriesSynthSilk,3227726848,Textiles,Tiegfries Synth Silk -128667696,UzumokuLowGWings,3226474496,Consumer Items,Uzumoku Low-G Wings -128667697,VHerculisBodyRub,3228959232,Medicines,V Herculis Body Rub -128667698,WheemeteWheatCakes,3225032704,Foods,Wheemete Wheat Cakes -128667699,VegaSlimWeed,128149240,Medicines,Vega Slimweed -128667700,AltairianSkin,128151032,Consumer Items,Altairian Skin -128667701,PavonisEarGrubs,128117240,Legal Drugs,Pavonis Ear Grubs -128667702,JotunMookah,128078840,Textiles,Jotun Mookah -128667703,GiantVerrix,128121336,Machinery,Giant Verrix -128667704,IndiBourbon,128118520,Legal Drugs,Indi Bourbon -128667705,AroucaConventualSweets,128098040,Foods,Arouca Conventual Sweets -128667706,TauriChimes,128134648,Consumer Items,Tauri Chimes -128667707,ZeesszeAntGlue,128125432,Consumer Items,Zeessze Ant Grub Glue -128667708,PantaaPrayerSticks,3228824064,Medicines,Pantaa Prayer Sticks -128667709,FujinTea,128134392,Foods,Fujin Tea -128667710,ChameleonCloth,3223418880,Textiles,Chameleon Cloth -128667711,OrrerianViciousBrew,128166392,Foods,Orrerian Vicious Brew -128667712,UszaianTreeGrub,128164856,Foods,Uszaian Tree Grub -128667713,MomusBogSpaniel,128075256,Consumer Items,Momus Bog Spaniel -128667714,DisoMaCorn,128161016,Foods,Diso Ma Corn -128667715,LeestianEvilJuice,128639992,Legal Drugs,Leestian Evil Juice -128667716,BlueMilk,128639992,Foods,Azure Milk -128667717,AlienEggs,128164088,Consumer Items,Leathery Eggs -128667718,AlyaBodilySoap,3221638400,Medicines,Alya Body Soap -128667719,VidavantianLace,3231082240,Consumer Items,Vidavantian Lace -128667760,TransgenicOnionHead,128057866,Legal Drugs,Lucan Onionhead -128668017,JaquesQuinentianStill,128667761,Consumer Items,Jaques Quinentian Still -128668018,SoontillRelics,3225348096,Consumer Items,Soontill Relics -128671119,Advert1,3227172352,Consumer Items,Ultra-Compact Processor Prototypes -128672121,TheHuttonMug,3228728832,Consumer Items,The Hutton Mug -128672122,SothisCrystallineGold,128668557,Metals,Sothis Crystalline Gold -128672316,MasterChefs,3228193280,Slavery,Master Chefs -128672431,PersonalGifts,3223105792,Salvage,Personal Gifts -128672432,CrystallineSpheres,128059402,Salvage,Crystalline Spheres -128672812,OnionHeadA,3226977024,Legal Drugs,Onionhead Alpha Strain -128673069,OnionHeadB,3223027200,Legal Drugs,Onionhead Beta Strain -128682050,GalacticTravelGuide,128673074,Salvage,Galactic Travel Guide -128727921,AnimalEffigies,3228463360,Legal Drugs,Crom Silver Fesh -128732551,ShansCharisOrchid,128107768,Consumer Items,Shan's Charis Orchid -128748428,BuckyballBeerMats,128745551,Consumer Items,Buckyball Beer Mats -128793113,HarmaSilverSeaRum,3221575424,Legal Drugs,Harma Silver Sea Rum -128793114,PlatinumAloy,3223779840,Metals,Platinum Alloy From da4ae24440c7815492a6f59d7416725dea0cee37 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 17 Dec 2021 12:23:20 +0000 Subject: [PATCH 263/527] Document use of *local* outfitting.csv instead of FDevIDs version That's in collate.py and coriolis.py docstrings. --- collate.py | 5 +++++ coriolis.py | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/collate.py b/collate.py index d789a6c5..3ab5224b 100755 --- a/collate.py +++ b/collate.py @@ -5,6 +5,11 @@ Collate lists of seen commodities, modules and ships from dumps of the Companion Note that currently this will only work with the output files created if you run the main program from a working directory that has a `dump/` directory, which causes a file to be written per CAPI query. + +This script also utilise the file outfitting.csv. As it both reads it in *and* +writes out a new copy a local copy, in the root of the project structure, is +used for this purpose. If you want to utilise the FDevIDs/ version of the +file, copy it over the local one. """ import csv diff --git a/coriolis.py b/coriolis.py index 5ce76a29..0afb16e5 100755 --- a/coriolis.py +++ b/coriolis.py @@ -1,5 +1,12 @@ #!/usr/bin/env python3 -"""Build ship and module databases from https://github.com/EDCD/coriolis-data/ .""" +""" +Build ship and module databases from https://github.com/EDCD/coriolis-data/ . + +This script also utilise the file outfitting.csv. Due to how collate.py +both reads and writes to this file a local copy is used, in the root of the +project structure, is used for this purpose. If you want to utilise the +FDevIDs/ version of the file, copy it over the local one. +""" import csv From 36c0bc10fddafef4ce4d63564fcd6495cc329134 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 17:03:37 +0000 Subject: [PATCH 264/527] build(deps-dev): bump types-requests from 2.26.1 to 2.26.2 Bumps [types-requests](https://github.com/python/typeshed) from 2.26.1 to 2.26.2. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a071b9ce..dd5b03be 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.920 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.26.1 +types-requests==2.26.2 # Code formatting tools autopep8==1.6.0 From b74bf63076c68c1dd23b00d7b45746a3ff2ab0f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:04:26 +0000 Subject: [PATCH 265/527] build(deps-dev): bump pywin32 from 302 to 303 Bumps [pywin32](https://github.com/mhammond/pywin32) from 302 to 303. - [Release notes](https://github.com/mhammond/pywin32/releases) - [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt) - [Commits](https://github.com/mhammond/pywin32/commits) --- updated-dependencies: - dependency-name: pywin32 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index dd5b03be..c5d90f3c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -37,7 +37,7 @@ pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. -pywin32==302; sys_platform == 'win32' +pywin32==303; sys_platform == 'win32' # All of the normal requirements From 0f0a4211ee43c40e7dcee7c05bfdb8d042904db4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 17:03:30 +0000 Subject: [PATCH 266/527] build(deps-dev): bump mypy from 0.920 to 0.921 Bumps [mypy](https://github.com/python/mypy) from 0.920 to 0.921. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.920...v0.921) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index dd5b03be..50b5a65c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,7 +15,7 @@ flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.920 +mypy==0.921 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.26.2 From 04bba0dda252c03aca7be9595b909a3f99e60be0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Dec 2021 17:03:19 +0000 Subject: [PATCH 267/527] build(deps-dev): bump mypy from 0.921 to 0.930 Bumps [mypy](https://github.com/python/mypy) from 0.921 to 0.930. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.921...v0.930) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a3dcf9a8..d4a58ae0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,7 +15,7 @@ flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.921 +mypy==0.930 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.26.2 From 997adf332ac3ac76decea5f8d851047d36904ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Dec 2021 17:03:31 +0000 Subject: [PATCH 268/527] build(deps-dev): bump types-requests from 2.26.2 to 2.26.3 Bumps [types-requests](https://github.com/python/typeshed) from 2.26.2 to 2.26.3. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d4a58ae0..69b3bb23 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.930 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.26.2 +types-requests==2.26.3 # Code formatting tools autopep8==1.6.0 From 5589c16dea3dceda92bff534b9a1a4396cae42ff Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 31 Dec 2021 20:24:07 +0000 Subject: [PATCH 269/527] config: Bump copyright end year --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 14a79651..18879201 100644 --- a/config.py +++ b/config.py @@ -35,7 +35,7 @@ appcmdname = 'EDMC' # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() _static_appversion = '5.3.0-beta3' _cached_version: Optional[semantic_version.Version] = None -copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD' +copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml' update_interval = 8*60*60 From ee5f80cde1d73ddd374fd3e3b15e420a63aa0c74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 17:05:45 +0000 Subject: [PATCH 270/527] build(deps): bump requests from 2.26.0 to 2.27.0 Bumps [requests](https://github.com/psf/requests) from 2.26.0 to 2.27.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.26.0...v2.27.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bcf9b57d..cd73000f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ certifi==2021.10.8 -requests==2.26.0 +requests==2.27.0 watchdog==2.1.6 # Commented out because this doesn't package well with py2exe infi.systray==0.1.12; sys_platform == 'win32' From 6c67435b8a3901bfa88eb87d4337fa92d783194e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 17:03:51 +0000 Subject: [PATCH 271/527] build(deps): bump requests from 2.27.0 to 2.27.1 Bumps [requests](https://github.com/psf/requests) from 2.27.0 to 2.27.1. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.27.0...v2.27.1) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cd73000f..479425c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ certifi==2021.10.8 -requests==2.27.0 +requests==2.27.1 watchdog==2.1.6 # Commented out because this doesn't package well with py2exe infi.systray==0.1.12; sys_platform == 'win32' From a5affe34366c53584cfb304e8ce2588c77576da5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 17:03:52 +0000 Subject: [PATCH 272/527] build(deps-dev): bump mypy from 0.930 to 0.931 Bumps [mypy](https://github.com/python/mypy) from 0.930 to 0.931. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.930...v0.931) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 69b3bb23..3a9009fd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,7 +15,7 @@ flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.930 +mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.26.3 From 9a590f700eb273e423f2bdd07d4093de2881db88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 17:03:58 +0000 Subject: [PATCH 273/527] build(deps-dev): bump types-requests from 2.26.3 to 2.27.1 Bumps [types-requests](https://github.com/python/typeshed) from 2.26.3 to 2.27.1. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 69b3bb23..5dbff540 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.930 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.26.3 +types-requests==2.27.1 # Code formatting tools autopep8==1.6.0 From 6798c083848ffd0028c44da4c443ed1f5a5dcbc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 17:03:58 +0000 Subject: [PATCH 274/527] build(deps-dev): bump types-requests from 2.27.1 to 2.27.5 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.1 to 2.27.5. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b855240a..d5bb36b8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.1 +types-requests==2.27.5 # Code formatting tools autopep8==1.6.0 From f422d1efe78f61cfed6b1132e281781fb0b625dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jan 2022 17:03:24 +0000 Subject: [PATCH 275/527] build(deps-dev): bump flake8-comprehensions from 3.7.0 to 3.8.0 Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases) - [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst) - [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.7.0...3.8.0) --- updated-dependencies: - dependency-name: flake8-comprehensions dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d5bb36b8..a1ce6af6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ wheel flake8==4.0.1 flake8-annotations-coverage==0.0.5 flake8-cognitive-complexity==0.1.0 -flake8-comprehensions==3.7.0 +flake8-comprehensions==3.8.0 flake8-docstrings==1.6.0 isort==5.10.1 flake8-isort==4.1.1 From fcf2ccfdedf23f76c1547c2f4e1dca85060e7679 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jan 2022 17:04:01 +0000 Subject: [PATCH 276/527] build(deps-dev): bump types-requests from 2.27.5 to 2.27.6 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.5 to 2.27.6. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a1ce6af6..a4c1c296 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.5 +types-requests==2.27.6 # Code formatting tools autopep8==1.6.0 From 65c806ea97daba0ced2d9c5a362e95a0da3ab2ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 17:06:26 +0000 Subject: [PATCH 277/527] build(deps-dev): bump types-requests from 2.27.6 to 2.27.7 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.6 to 2.27.7. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a4c1c296..d746f046 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.6 +types-requests==2.27.7 # Code formatting tools autopep8==1.6.0 From 2e50f357ee5fe03c16e74a52a91b3564b714ba96 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 20 Jan 2022 13:28:47 +0000 Subject: [PATCH 278/527] config.py: Bump to 5.3.0-beta4 to ensure I'm testing 3.10.2 build --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 18879201..b32b2613 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta3' +_static_appversion = '5.3.0-beta4' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From dfa8051f4242a8e44d2868b271d49585b2ad3a01 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 20 Jan 2022 13:32:01 +0000 Subject: [PATCH 279/527] python: Bump to 3.10.2 Confirmed working with a build+run. CAPI update works, Inara plugin works, Settings open without issues.... --- .github/workflows/windows-build.yml | 2 +- .python-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 80b61487..5d12da92 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.4.0 - uses: actions/setup-python@v2.3.1 with: - python-version: "3.10.1" + python-version: "3.10.2" architecture: "x86" - name: Install python tools diff --git a/.python-version b/.python-version index f870be23..7b59a5ca 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.1 +3.10.2 From 85f7bddef0b2f37de3812d81e3e2f2a051786923 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 15:52:44 +0200 Subject: [PATCH 280/527] use gmtime as time formatter --- EDMCLogging.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/EDMCLogging.py b/EDMCLogging.py index c00b7ab9..c98ebe04 100644 --- a/EDMCLogging.py +++ b/EDMCLogging.py @@ -46,6 +46,7 @@ from fnmatch import fnmatch # So that any warning about accessing a protected member is only in one place. from sys import _getframe as getframe from threading import get_native_id as thread_native_id +from time import gmtime from traceback import print_exc from typing import TYPE_CHECKING, Tuple, cast @@ -91,6 +92,9 @@ logging.Logger.trace = lambda self, message, *args, **kwargs: self._log( # type **kwargs ) +# make logging use UTC for times +logging.Formatter.converter = gmtime + def _trace_if(self: logging.Logger, condition: str, message: str, *args, **kwargs) -> None: if any(fnmatch(condition, p) for p in config_mod.trace_on): From cd81f65ed73958c0d32999de7b12e8d0e8c4b2f9 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 15:20:01 +0200 Subject: [PATCH 281/527] Reset geometry and UI scale with --reset-ui --- EDMarketConnector.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index c0f69f08..fb136fca 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1867,7 +1867,11 @@ sys.path: {sys.path}''' config.set('ui_transparency', 100) # 100 is completely opaque config.delete('font') config.delete('font_size') - logger.info('reset theme, font, font size, and transparency to default.') + + config.set('ui_scale', 100) # 100% is the default here + config.delete('geometry') # unset is recreated by other code + + logger.info('reset theme, transparency, font, font size, ui scale, and ui geometry to default.') # We prefer a UTF-8 encoding gets set, but older Windows versions have # issues with this. From Windows 10 1903 onwards we can rely on the From 7bb060f32cadafa084209bf589d6903b633aded8 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 16:02:23 +0200 Subject: [PATCH 282/527] dont explode if a key doesnt exist when resetting --- EDMarketConnector.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index fb136fca..01c9d846 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -74,7 +74,7 @@ if __name__ == '__main__': # noqa: C901 ########################################################################### parser.add_argument( '--reset-ui', - help='reset UI theme and transparency to defaults', + help='Reset UI theme, transparency, font, font size, ui scale, and ui geometry to default', action='store_true' ) ########################################################################### @@ -1865,11 +1865,11 @@ sys.path: {sys.path}''' if args.reset_ui: config.set('theme', 0) # 'Default' theme uses ID 0 config.set('ui_transparency', 100) # 100 is completely opaque - config.delete('font') - config.delete('font_size') + config.delete('font', suppress=True) + config.delete('font_size', suppress=True) config.set('ui_scale', 100) # 100% is the default here - config.delete('geometry') # unset is recreated by other code + config.delete('geometry', suppress=True) # unset is recreated by other code logger.info('reset theme, transparency, font, font size, ui scale, and ui geometry to default.') From 66a212f7c46d6ca603618477f556ffef8208411a Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 16:26:04 +0200 Subject: [PATCH 283/527] move UTC to hardcoded, add comment --- EDMCLogging.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/EDMCLogging.py b/EDMCLogging.py index c98ebe04..3f08f436 100644 --- a/EDMCLogging.py +++ b/EDMCLogging.py @@ -166,7 +166,10 @@ class Logger: self.logger_formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(process)d:%(thread)d:%(osthreadid)d %(module)s.%(qualname)s:%(lineno)d: %(message)s') # noqa: E501 self.logger_formatter.default_time_format = '%Y-%m-%d %H:%M:%S' - self.logger_formatter.default_msec_format = '%s.%03d' + # WORKAROUND n/a | 2022-01-20: This is concatted to the above time format, so including %Z there is broken + # As a sidenote, this will not always match with journal time etc. As that's based + # on the elite server side time + self.logger_formatter.default_msec_format = '%s.%03d UTC' self.logger_channel.setFormatter(self.logger_formatter) self.logger.addHandler(self.logger_channel) From 5f007b3f77bd62204960bdf9c778547924e60f7d Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 16:32:36 +0200 Subject: [PATCH 284/527] more clarifying logs --- EDMCLogging.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/EDMCLogging.py b/EDMCLogging.py index 3f08f436..85e7d843 100644 --- a/EDMCLogging.py +++ b/EDMCLogging.py @@ -92,7 +92,9 @@ logging.Logger.trace = lambda self, message, *args, **kwargs: self._log( # type **kwargs ) -# make logging use UTC for times +# make logging use UTC for times, to help make our logs congruent with journals etc. +# Note that as this is the local system vs the remote system (ED servers, for journals), times may not be perfectly +# in sync. (something something NTP) logging.Formatter.converter = gmtime From 3b4f6a4e859773d2534307a876719a1d4f1c77d5 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 16:41:18 +0200 Subject: [PATCH 285/527] switch comments to MAGIC tags --- EDMCLogging.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/EDMCLogging.py b/EDMCLogging.py index 85e7d843..82807c90 100644 --- a/EDMCLogging.py +++ b/EDMCLogging.py @@ -92,9 +92,10 @@ logging.Logger.trace = lambda self, message, *args, **kwargs: self._log( # type **kwargs ) -# make logging use UTC for times, to help make our logs congruent with journals etc. -# Note that as this is the local system vs the remote system (ED servers, for journals), times may not be perfectly -# in sync. (something something NTP) +# MAGIC n/a: 2020-01-20: make logging use UTC for times, to help make our logs congruent with journals etc. +# MAGIC-CONT: Note that as this is the local system vs the remote system (ED servers, for journals), +# MAGIC-CONT: times may not be perfectly in sync. (something something NTP). +# MAGIC-CONT: See MAGIC tagged comment in Logger.__init__() logging.Formatter.converter = gmtime @@ -168,9 +169,9 @@ class Logger: self.logger_formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(process)d:%(thread)d:%(osthreadid)d %(module)s.%(qualname)s:%(lineno)d: %(message)s') # noqa: E501 self.logger_formatter.default_time_format = '%Y-%m-%d %H:%M:%S' - # WORKAROUND n/a | 2022-01-20: This is concatted to the above time format, so including %Z there is broken - # As a sidenote, this will not always match with journal time etc. As that's based - # on the elite server side time + # MAGIC n/a | 2022-01-20: As of Python 3.10.2 you can *not* use either `%s.%03.d` in default_time_format + # MAGIC-CONT: *or* use `%Z` in default_time_msec (as its concatted to default_msec). + # MAGIC-CONT: UTC is hardcoded here because we know it always will be (see above MAGIC comment) self.logger_formatter.default_msec_format = '%s.%03d UTC' self.logger_channel.setFormatter(self.logger_formatter) From 71261fc3d9eb84320de4cc9fee83f42856fd40d6 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 16:48:29 +0200 Subject: [PATCH 286/527] Reorder and clarify some comments --- EDMCLogging.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EDMCLogging.py b/EDMCLogging.py index 82807c90..82f56ca3 100644 --- a/EDMCLogging.py +++ b/EDMCLogging.py @@ -170,8 +170,8 @@ class Logger: self.logger_formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(process)d:%(thread)d:%(osthreadid)d %(module)s.%(qualname)s:%(lineno)d: %(message)s') # noqa: E501 self.logger_formatter.default_time_format = '%Y-%m-%d %H:%M:%S' # MAGIC n/a | 2022-01-20: As of Python 3.10.2 you can *not* use either `%s.%03.d` in default_time_format - # MAGIC-CONT: *or* use `%Z` in default_time_msec (as its concatted to default_msec). - # MAGIC-CONT: UTC is hardcoded here because we know it always will be (see above MAGIC comment) + # MAGIC-CONT: (throws exceptions), *or* use `%Z` in default_time_msec (formatting issues). + # UTC is hardcoded here because we know it always will be (see above MAGIC comment) self.logger_formatter.default_msec_format = '%s.%03d UTC' self.logger_channel.setFormatter(self.logger_formatter) From 251f129774412a1704fb4a3c3348d2d04fdc7de2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 20 Jan 2022 14:58:06 +0000 Subject: [PATCH 287/527] EDMCLogging: Reword/format the 'UTC please' MAGIC comments --- EDMCLogging.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/EDMCLogging.py b/EDMCLogging.py index 82f56ca3..5248f544 100644 --- a/EDMCLogging.py +++ b/EDMCLogging.py @@ -92,9 +92,9 @@ logging.Logger.trace = lambda self, message, *args, **kwargs: self._log( # type **kwargs ) -# MAGIC n/a: 2020-01-20: make logging use UTC for times, to help make our logs congruent with journals etc. -# MAGIC-CONT: Note that as this is the local system vs the remote system (ED servers, for journals), -# MAGIC-CONT: times may not be perfectly in sync. (something something NTP). +# MAGIC n/a: 2022-01-20: We want logging timestamps to be in UTC, not least because the game journals log in UTC. +# MAGIC-CONT: Note that the game client uses the ED server's idea of UTC, which can easily be different from machine +# MAGIC-CONT: local idea of it. So don't expect our log timestamps to perfectly match Journal ones. # MAGIC-CONT: See MAGIC tagged comment in Logger.__init__() logging.Formatter.converter = gmtime @@ -170,8 +170,9 @@ class Logger: self.logger_formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(process)d:%(thread)d:%(osthreadid)d %(module)s.%(qualname)s:%(lineno)d: %(message)s') # noqa: E501 self.logger_formatter.default_time_format = '%Y-%m-%d %H:%M:%S' # MAGIC n/a | 2022-01-20: As of Python 3.10.2 you can *not* use either `%s.%03.d` in default_time_format - # MAGIC-CONT: (throws exceptions), *or* use `%Z` in default_time_msec (formatting issues). - # UTC is hardcoded here because we know it always will be (see above MAGIC comment) + # MAGIC-CONT: (throws exceptions), *or* use `%Z` in default_time_msec (more exceptions). + # MAGIC-CONT: ' UTC' is hard-coded here - we know we're using the local machine's idea of UTC/GMT because we + # MAGIC-CONT: cause logging.Formatter() to use `gmtime()` - see MAGIC comment in this file's top-level code. self.logger_formatter.default_msec_format = '%s.%03d UTC' self.logger_channel.setFormatter(self.logger_formatter) From 333b84ada698d5913add4443e7a233a7a26abc58 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 20 Jan 2022 14:59:46 +0000 Subject: [PATCH 288/527] EDMCLogging: Fix minor MAGIC comment format issue --- EDMCLogging.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMCLogging.py b/EDMCLogging.py index 5248f544..1bf83bc7 100644 --- a/EDMCLogging.py +++ b/EDMCLogging.py @@ -92,7 +92,7 @@ logging.Logger.trace = lambda self, message, *args, **kwargs: self._log( # type **kwargs ) -# MAGIC n/a: 2022-01-20: We want logging timestamps to be in UTC, not least because the game journals log in UTC. +# MAGIC n/a | 2022-01-20: We want logging timestamps to be in UTC, not least because the game journals log in UTC. # MAGIC-CONT: Note that the game client uses the ED server's idea of UTC, which can easily be different from machine # MAGIC-CONT: local idea of it. So don't expect our log timestamps to perfectly match Journal ones. # MAGIC-CONT: See MAGIC tagged comment in Logger.__init__() From 7ac248be7a748e7f5bbd170c6dbbf66a957a0b83 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 20 Jan 2022 17:45:23 +0000 Subject: [PATCH 289/527] inara: Utilise Statistics Current_Wealth for commanderAssets Inara itself seems to be doing this if it has access to CAPI-sourced Journals. If we don't send commanderAssets as part of setCommanderCredits then it does ... something else ... and ends up with your total assets value bouncing between what EDMC is causing and what it sees from the CAPI-sourced journals. So, don't send this from LoadGame any more, instead wait for Statistics, and if it has the relevant data, also send commanderAssets. --- plugins/inara.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index a3e2a22c..86e3ec25 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -737,17 +737,24 @@ def journal_entry( # noqa: C901, CCR001 logger.debug('Adding events', exc_info=e) return str(e) - # Send credits and stats to Inara on startup only - otherwise may be out of date + # We want to utilise some Statistics data, so don't setCommanderCredits here if event_name == 'LoadGame': - new_add_event( - 'setCommanderCredits', - entry['timestamp'], - {'commanderCredits': state['Credits'], 'commanderLoan': state['Loan']} - ) - this.lastcredits = state['Credits'] elif event_name == 'Statistics': + inara_data = { + 'commanderCredits': state['Credits'], + 'commanderLoan': state['Loan'], + } + if entry.get('Bank_Account') is not None: + if entry['Bank_Account'].get('Current_Wealth') is not None: + inara_data['commanderAssets'] = entry['Bank_Account']['Current_Wealth'] + + new_add_event( + 'setCommanderCredits', + entry['timestamp'], + inara_data + ) new_add_event('setCommanderGameStatistics', entry['timestamp'], state['Statistics']) # may be out of date # Selling / swapping ships From eb0ff31805ccfddce41cf09033b17dac51eb6369 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 25 Jan 2022 14:26:42 +0000 Subject: [PATCH 290/527] Python: Bump minor version in GH workflows & update Releasing.md I used Releasing.md as reference for what would need the version updating, but it didn't say anything about all the workflows, it now does. --- .github/workflows/pr-checks.yml | 4 ++-- .github/workflows/push-checks.yml | 4 ++-- docs/Releasing.md | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index a1472e27..c89cbae5 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -52,10 +52,10 @@ jobs: #################################################################### # Get Python set up #################################################################### - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v2.3.1 with: - python-version: 3.9 + python-version: 3.10 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 5f78645f..ba9c64be 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -20,10 +20,10 @@ jobs: - uses: actions/checkout@v2.4.0 with: fetch-depth: 0 - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v2.3.1 with: - python-version: 3.9 + python-version: 3.10 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/docs/Releasing.md b/docs/Releasing.md index 37d14ae6..50f5d0d6 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -446,3 +446,5 @@ When changing the Python version (Major.Minor.Patch) used: pythonXX.dll file. 3. `.pre-commit-config.yaml` will need the `default_language_version` section updated to the appropriate version. + 4. All `.github/workflows/` files will need to be citing the correct + version in any `uses: actions/setup-python` section. From 109f964fc3840e595423a2b1b2e534d1d900e2d7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 25 Jan 2022 14:30:58 +0000 Subject: [PATCH 291/527] Python: Version must be a quoted string now Else `3.10` gets interpreted as `3.1` and it all breaks. --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index c89cbae5..7b0a61c2 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -55,7 +55,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v2.3.1 with: - python-version: 3.10 + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index ba9c64be..e8cf5f5c 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v2.3.1 with: - python-version: 3.10 + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip From c4f734734e2f80cbf9e0ce057ce5d949decde0dc Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 25 Jan 2022 14:59:53 +0000 Subject: [PATCH 292/527] inara: snake_case lastcredits variable --- plugins/inara.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index 86e3ec25..53be13d2 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -76,7 +76,7 @@ class This: self.suppress_docked = False # Skip initial Docked event if started docked self.cargo: Optional[List[OrderedDictT[str, Any]]] = None self.materials: Optional[List[OrderedDictT[str, Any]]] = None - self.lastcredits: int = 0 # Send credit update soon after Startup / new game + self.last_credits: int = 0 # Send credit update soon after Startup / new game self.storedmodules: Optional[List[OrderedDictT[str, Any]]] = None self.loadout: Optional[OrderedDictT[str, Any]] = None self.fleet: Optional[List[OrderedDictT[str, Any]]] = None @@ -372,7 +372,7 @@ def journal_entry( # noqa: C901, CCR001 this.suppress_docked = False this.cargo = None this.materials = None - this.lastcredits = 0 + this.last_credits = 0 this.storedmodules = None this.loadout = None this.fleet = None @@ -383,8 +383,8 @@ def journal_entry( # noqa: C901, CCR001 this.station_marketid = None elif event_name in ('Resurrect', 'ShipyardBuy', 'ShipyardSell', 'SellShipOnRebuy'): - # Events that mean a significant change in credits so we should send credits after next "Update" - this.lastcredits = 0 + # Events that mean a significant change in credits, so we should send credits after next "Update" + this.last_credits = 0 elif event_name in ('ShipyardNew', 'ShipyardSwap') or (event_name == 'Location' and entry['Docked']): this.suppress_docked = True @@ -739,7 +739,7 @@ def journal_entry( # noqa: C901, CCR001 # We want to utilise some Statistics data, so don't setCommanderCredits here if event_name == 'LoadGame': - this.lastcredits = state['Credits'] + this.last_credits = state['Credits'] elif event_name == 'Statistics': inara_data = { @@ -1356,7 +1356,7 @@ def cmdr_data(data: CAPIData, is_beta): # noqa: CCR001 this.station_link.update_idletasks() if config.get_int('inara_out') and not is_beta and not this.multicrew and credentials(this.cmdr): - if not (CREDIT_RATIO > this.lastcredits / data['commander']['credits'] > 1/CREDIT_RATIO): + if not (CREDIT_RATIO > this.last_credits / data['commander']['credits'] > 1 / CREDIT_RATIO): this.filter_events( Credentials(this.cmdr, this.FID, str(credentials(this.cmdr))), lambda e: e.name != 'setCommanderCredits' @@ -1372,7 +1372,7 @@ def cmdr_data(data: CAPIData, is_beta): # noqa: CCR001 } ) - this.lastcredits = int(data['commander']['credits']) + this.last_credits = int(data['commander']['credits']) def make_loadout(state: Dict[str, Any]) -> OrderedDictT[str, Any]: # noqa: CCR001 From ded86c2ff56abe6cb3c1976d14aa5957293fdc30 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 25 Jan 2022 15:00:33 +0000 Subject: [PATCH 293/527] inara: Rename to current_credentials to avoid 'creds' ambiguity Every time I see `current_creds` my first though is "creds means credits". --- plugins/inara.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index 53be13d2..69270e97 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -419,7 +419,7 @@ def journal_entry( # noqa: C901, CCR001 this.station_marketid = None if config.get_int('inara_out') and not is_beta and not this.multicrew and credentials(cmdr): - current_creds = Credentials(this.cmdr, this.FID, str(credentials(this.cmdr))) + current_credentials = Credentials(this.cmdr, this.FID, str(credentials(this.cmdr))) try: # Dump starting state to Inara if (this.newuser or event_name == 'StartUp' or (this.newsession and event_name == 'Cargo')): @@ -844,7 +844,7 @@ def journal_entry( # noqa: C901, CCR001 if this.fleet != fleet: this.fleet = fleet - this.filter_events(current_creds, lambda e: e.name != 'setCommanderShip') + this.filter_events(current_credentials, lambda e: e.name != 'setCommanderShip') # this.events = [x for x in this.events if x['eventName'] != 'setCommanderShip'] # Remove any unsent for ship in this.fleet: @@ -857,7 +857,7 @@ def journal_entry( # noqa: C901, CCR001 this.loadout = loadout this.filter_events( - current_creds, + current_credentials, lambda e: ( e.name != 'setCommanderShipLoadout' or cast(dict, e.data)['shipGameID'] != cast(dict, this.loadout)['shipGameID']) @@ -898,7 +898,7 @@ def journal_entry( # noqa: C901, CCR001 # Only send on change this.storedmodules = modules # Remove any unsent - this.filter_events(current_creds, lambda e: e.name != 'setCommanderStorageModules') + this.filter_events(current_credentials, lambda e: e.name != 'setCommanderStorageModules') # this.events = list(filter(lambda e: e['eventName'] != 'setCommanderStorageModules', this.events)) new_add_event('setCommanderStorageModules', entry['timestamp'], this.storedmodules) @@ -1227,7 +1227,7 @@ def journal_entry( # noqa: C901, CCR001 if event_name == 'CommunityGoal': # Remove any unsent this.filter_events( - current_creds, lambda e: e.name not in ('setCommunityGoal', 'setCommanderCommunityGoalProgress') + current_credentials, lambda e: e.name not in ('setCommunityGoal', 'setCommanderCommunityGoalProgress') ) # this.events = list(filter( From 28cbd6e0ea46db70e2f8388f5a0d19b70fc32b83 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 25 Jan 2022 15:27:35 +0000 Subject: [PATCH 294/527] Inara: queue 'Rank'/'setCommanderRankPilot' as soon as seen This means we *will* send a message when logging in on foot, rather than waiting for a `Cargo` event that never arrives. --- plugins/inara.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index 69270e97..868671ec 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -426,16 +426,6 @@ def journal_entry( # noqa: C901, CCR001 this.newuser = False this.newsession = False - # Send rank info to Inara on startup - new_add_event( - 'setCommanderRankPilot', - entry['timestamp'], - [ - {'rankName': k.lower(), 'rankValue': v[0], 'rankProgress': v[1] / 100.0} - for k, v in state['Rank'].items() if v is not None - ] - ) - # Don't send the API call with no values. if state['Reputation']: new_add_event( @@ -503,6 +493,18 @@ def journal_entry( # noqa: C901, CCR001 this.loadout = make_loadout(state) new_add_event('setCommanderShipLoadout', entry['timestamp'], this.loadout) + # Login-time Ranks + elif event_name == 'Rank': + # Send rank info to Inara on startup + new_add_event( + 'setCommanderRankPilot', + entry['timestamp'], + [ + {'rankName': k.lower(), 'rankValue': v[0], 'rankProgress': v[1] / 100.0} + for k, v in state['Rank'].items() if v is not None + ] + ) + # Promotions elif event_name == 'Promotion': for k, v in state['Rank'].items(): From 626fb0cb87e606e83d352e3c67f1b00f80f3d427 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 17:39:44 +0200 Subject: [PATCH 295/527] add odyssey ranks to status page --- stats.py | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/stats.py b/stats.py index 334e8358..f48142aa 100644 --- a/stats.py +++ b/stats.py @@ -56,15 +56,17 @@ def status(data: Dict[str, Any]) -> List[List[str]]: RANKS = [ # noqa: N806 # Its a constant, just needs to be updated at runtime # in output order - (_('Combat'), 'combat'), # LANG: Ranking - (_('Trade'), 'trade'), # LANG: Ranking - (_('Explorer'), 'explore'), # LANG: Ranking - (_('CQC'), 'cqc'), # LANG: Ranking - (_('Federation'), 'federation'), # LANG: Ranking - (_('Empire'), 'empire'), # LANG: Ranking - (_('Powerplay'), 'power'), # LANG: Ranking - # ??? , 'crime'), # LANG: Ranking - # ??? , 'service'), # LANG: Ranking + (_('Combat'), 'combat'), # LANG: Ranking + (_('Trade'), 'trade'), # LANG: Ranking + (_('Explorer'), 'explore'), # LANG: Ranking + (_('Mercenary'), 'mercenary'), # LANG: Ranking + (_('Exobiologist'), 'exobiologist'), # LANG: Ranking + (_('CQC'), 'cqc'), # LANG: Ranking + (_('Federation'), 'federation'), # LANG: Ranking + (_('Empire'), 'empire'), # LANG: Ranking + (_('Powerplay'), 'power'), # LANG: Ranking + # ??? , 'crime'), # LANG: Ranking + # ??? , 'service'), # LANG: Ranking ] RANK_NAMES = { # noqa: N806 # Its a constant, just needs to be updated at runtime @@ -102,6 +104,28 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Pioneer'), # LANG: Explorer rank _('Elite') # LANG: Top rank ], + 'mercenary': [ + _('Defenceless'), # LANG: Mercenary rank + _('Mostly Defenceless'), # LANG: Mercenary rank + _('Rookie'), # LANG: Mercenary rank + _('Soldier'), # LANG: Mercenary rank + _('Gunslinger'), # LANG: Mercenary rank + _('Warrior'), # LANG: Mercenary rank + _('Gunslinger'), # LANG: Mercenary rank + _('Deadeye'), # LANG: Mercenary rank + _('Elite'), # LANG: Top rank + ], + 'exobiologist': [ + _('Directionless'), # LANG: Exobiologist rank + _('Mostly Directionless'), # LANG: Exobiologist rank + _('Compiler'), # LANG: Exobiologist rank + _('Collector'), # LANG: Exobiologist rank + _('Cataloguer'), # LANG: Exobiologist rank + _('Taxonomist'), # LANG: Exobiologist rank + _('Ecologist'), # LANG: Exobiologist rank + _('Geneticist'), # LANG: Exobiologist rank + _('Elite'), # LANG: Top rank + ], 'cqc': [ _('Helpless'), # LANG: CQC rank _('Mostly Helpless'), # LANG: CQC rank @@ -167,6 +191,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: for title, thing in RANKS: rank = ranks.get(thing) names = RANK_NAMES[thing] + # TODO: handle Elite I-V here. if isinstance(rank, int): res.append([title, names[rank] if rank < len(names) else f'Rank {rank}']) @@ -357,7 +382,13 @@ class StatsResults(tk.Toplevel): # assumes things two and three are money self.addpagerow(page, [thing[0], self.credits(int(thing[1]))], with_copy=True) - for thing in stats[3:]: + # TODO: Headers, and a bit saner of some splitting up of things here + self.addpagespacer(page) + for thing in stats[3:9]: + self.addpagerow(page, thing, with_copy=True) + + self.addpagespacer(page) + for thing in stats[9:]: self.addpagerow(page, thing, with_copy=True) ttk.Frame(page).grid(pady=5) # bottom spacer From 1f9f7d45f9eb1ad524fd0e0ac8be1a9341500bc6 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 17:48:56 +0200 Subject: [PATCH 296/527] update lang --- L10n/en.template | 492 ++++++++++++++++++++++++++--------------------- 1 file changed, 273 insertions(+), 219 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index d520a556..e1849115 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "English"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Error: Frontier CAPI didn't respond"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Sending data to EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Error: Frontier server is lagging"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Docked but unknown station: EDO Settlement?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Send station data to the Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Error: Invalid Credentials"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Send system and scan data to the Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Error: Wrong Cmdr"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Delay sending until docked"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Error"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Send flight log and Cmdr status to EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Error: Couldn't check token customer_id"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map credentials"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Error: customer_id doesn't match!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:52; */ +"Cmdr" = "Cmdr"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Error: unable to get token"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Commander Name"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "Frontier CAPI down for maintenance"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Key"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Frontier CAPI query failure"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:143; stats.py:162; stats.py:181; stats.py:199; */ +"None" = "None"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Error: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Error: Can't connect to EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Send flight log and Cmdr status to Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara credentials"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Error: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normal"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "Normal URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Reset"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "Beta URL"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Override Beta/Normal selection"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Invalid Coriolis override mode!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "EDDB Journal processing disabled. See Log."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "EDDN journal handler disabled. See Log."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "EDSM Handler disabled. See Log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara disabled. See Log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: No commander data returned"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Override Beta/Normal Selection"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Error: EDMC is too old for EDDN. Please update."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Error: Validation Failed (EDMC Too Old?). See Log"; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "EDDN Error: Returned {STATUS} status code"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "No 'Route' array in NavRoute.json contents"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Journal directory already locked"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Retry"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignore"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Copy"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Update"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Error: Check E:D journal file location"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:398; */ "Ship" = "Ship"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Suit"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:400; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:401; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "File"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Save Raw Data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:395; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Release Notes"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Settings"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Copy"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Logging in..."; @@ -142,16 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Fetching data..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: No commander data returned"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:323; */ "Who are you?!" = "Who are you?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:333; */ "Where are you?!" = "Where are you?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:341; */ "What are you flying?!" = "What are you flying?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -181,126 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Shutting down..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Journal directory already locked"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Error: Frontier CAPI didn't respond"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Error: Frontier server is lagging"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Retry"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Docked but unknown station: EDO Settlement?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignore"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Error: Invalid Credentials"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Error: Wrong Cmdr"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Error"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Error: Couldn't check token customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Error: customer_id doesn't match!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Error: unable to get token"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI down for maintenance"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Frontier CAPI query failure"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Default"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normal"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "Normal URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Reset"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "Beta URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Override Beta/Normal Selection"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Invalid Coriolis override mode!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "EDDB Journal processing disabled. See Log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Sending data to EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Error: EDMC is too old for EDDN. Please update."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Error: Validation Failed (EDMC Too Old?). See Log"; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "EDDN Error: Returned {STATUS} status code"; - -/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No 'Route' array in NavRoute.json contents" = "No 'Route' array in NavRoute.json contents"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Send station data to the Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Send system and scan data to the Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Delay sending until docked"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "EDDN journal handler disabled. See Log."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Send flight log and Cmdr status to EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map credentials"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Commander Name"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Key"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "None"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "EDSM Handler disabled. See Log."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Error: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Error: Can't connect to EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Send flight log and Cmdr status to Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara credentials"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara disabled. See Log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Error: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferences"; @@ -458,220 +461,271 @@ "Explorer" = "Explorer"; /* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; +"Mercenary" = "Mercenary"; /* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federation"; +"Exobiologist" = "Exobiologist"; /* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Empire"; +"CQC" = "CQC"; /* stats.py: Ranking; In files: stats.py:65; */ +"Federation" = "Federation"; + +/* stats.py: Ranking; In files: stats.py:66; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:67; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:73; */ +/* stats.py: Combat rank; In files: stats.py:75; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:74; */ +/* stats.py: Combat rank; In files: stats.py:76; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:75; */ +/* stats.py: Combat rank; In files: stats.py:77; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:76; */ +/* stats.py: Combat rank; In files: stats.py:78; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:77; */ +/* stats.py: Combat rank; In files: stats.py:79; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:80; stats.py:165; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:79; */ +/* stats.py: Combat rank; In files: stats.py:81; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:80; */ +/* stats.py: Combat rank; In files: stats.py:82; */ "Deadly" = "Deadly"; -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:83; stats.py:94; stats.py:105; stats.py:116; stats.py:127; stats.py:138; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Trade rank; In files: stats.py:86; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:87; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:88; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:89; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:90; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:91; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:92; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:93; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:97; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:98; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:99; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:100; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:101; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:102; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:103; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:104; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:108; */ +"Defenceless" = "Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:109; */ +"Mostly Defenceless" = "Mostly Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:110; */ +"Rookie" = "Rookie"; + +/* stats.py: Mercenary rank; In files: stats.py:111; */ +"Soldier" = "Soldier"; + +/* stats.py: Mercenary rank; In files: stats.py:112; stats.py:114; */ +"Gunslinger" = "Gunslinger"; + +/* stats.py: Mercenary rank; In files: stats.py:113; */ +"Warrior" = "Warrior"; + +/* stats.py: Mercenary rank; In files: stats.py:115; */ +"Deadeye" = "Deadeye"; + +/* stats.py: Exobiologist rank; In files: stats.py:119; */ +"Directionless" = "Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:120; */ +"Mostly Directionless" = "Mostly Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:121; */ +"Compiler" = "Compiler"; + +/* stats.py: Exobiologist rank; In files: stats.py:122; */ +"Collector" = "Collector"; + +/* stats.py: Exobiologist rank; In files: stats.py:123; */ +"Cataloguer" = "Cataloguer"; + +/* stats.py: Exobiologist rank; In files: stats.py:124; */ +"Taxonomist" = "Taxonomist"; + +/* stats.py: Exobiologist rank; In files: stats.py:125; */ +"Ecologist" = "Ecologist"; + +/* stats.py: Exobiologist rank; In files: stats.py:126; */ +"Geneticist" = "Geneticist"; + +/* stats.py: CQC rank; In files: stats.py:130; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:131; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:132; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:133; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:134; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:135; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:136; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:137; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:144; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:145; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:146; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:147; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:148; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:149; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:150; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:151; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:152; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:153; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:154; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:155; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:156; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:163; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:164; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:166; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:167; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:168; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:169; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:170; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:171; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:172; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:173; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:174; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:175; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:182; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:183; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:184; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:185; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:186; */ "Rating 5" = "Rating 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:305; */ "Status: Don't yet know your Commander name" = "Status: Don't yet know your Commander name"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:313; */ "Status: No CAPI data yet" = "Status: No CAPI data yet"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:402; */ "Value" = "Value"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:411; */ "Ships" = "Ships"; From 046c07e89c4dca4dcddd500a7ec955ad739d983b Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 18:43:04 +0200 Subject: [PATCH 297/527] add Elite I-V --- L10n/en.template | 286 +++++++++++++++++++++++++---------------------- stats.py | 29 ++--- 2 files changed, 167 insertions(+), 148 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index e1849115..0ee1c172 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -31,7 +31,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:143; stats.py:162; stats.py:181; stats.py:199; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:147; stats.py:166; stats.py:185; stats.py:203; */ "None" = "None"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ @@ -136,16 +136,16 @@ /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:398; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:402; */ "Ship" = "Ship"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Suit"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:400; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:404; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:401; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:405; */ "Station" = "Station"; /* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ @@ -172,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Save Raw Data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:395; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:399; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -223,13 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Fetching data..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:323; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:327; */ "Who are you?!" = "Who are you?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:333; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:337; */ "Where are you?!" = "Where are you?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:341; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:345; */ "What are you flying?!" = "What are you flying?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -451,281 +451,297 @@ /* stats.py: Cmdr stats; In files: stats.py:54; */ "Loan" = "Loan"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trade"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"Mercenary" = "Mercenary"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Exobiologist" = "Exobiologist"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Federation" = "Federation"; - -/* stats.py: Ranking; In files: stats.py:66; */ -"Empire" = "Empire"; - -/* stats.py: Ranking; In files: stats.py:67; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:78; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:80; stats.py:165; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:81; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:82; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:83; stats.py:94; stats.py:105; stats.py:116; stats.py:127; stats.py:138; */ +/* stats.py: Top rank; In files: stats.py:58; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Top rank +1; In files: stats.py:59; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:60; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:61; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:62; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:63; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:68; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:69; */ +"Trade" = "Trade"; + +/* stats.py: Ranking; In files: stats.py:70; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:71; */ +"Mercenary" = "Mercenary"; + +/* stats.py: Ranking; In files: stats.py:72; */ +"Exobiologist" = "Exobiologist"; + +/* stats.py: Ranking; In files: stats.py:73; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:74; */ +"Federation" = "Federation"; + +/* stats.py: Ranking; In files: stats.py:75; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:84; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:85; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:86; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:87; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:88; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:89; stats.py:169; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:90; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:91; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:94; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:95; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:96; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:97; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:98; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:99; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:92; */ +/* stats.py: Trade rank; In files: stats.py:100; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:93; */ +/* stats.py: Trade rank; In files: stats.py:101; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:104; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:105; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:106; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:107; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:108; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:109; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:103; */ +/* stats.py: Explorer rank; In files: stats.py:110; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:104; */ +/* stats.py: Explorer rank; In files: stats.py:111; */ "Pioneer" = "Pioneer"; -/* stats.py: Mercenary rank; In files: stats.py:108; */ +/* stats.py: Mercenary rank; In files: stats.py:115; */ "Defenceless" = "Defenceless"; -/* stats.py: Mercenary rank; In files: stats.py:109; */ +/* stats.py: Mercenary rank; In files: stats.py:116; */ "Mostly Defenceless" = "Mostly Defenceless"; -/* stats.py: Mercenary rank; In files: stats.py:110; */ +/* stats.py: Mercenary rank; In files: stats.py:117; */ "Rookie" = "Rookie"; -/* stats.py: Mercenary rank; In files: stats.py:111; */ +/* stats.py: Mercenary rank; In files: stats.py:118; */ "Soldier" = "Soldier"; -/* stats.py: Mercenary rank; In files: stats.py:112; stats.py:114; */ +/* stats.py: Mercenary rank; In files: stats.py:119; stats.py:121; */ "Gunslinger" = "Gunslinger"; -/* stats.py: Mercenary rank; In files: stats.py:113; */ +/* stats.py: Mercenary rank; In files: stats.py:120; */ "Warrior" = "Warrior"; -/* stats.py: Mercenary rank; In files: stats.py:115; */ +/* stats.py: Mercenary rank; In files: stats.py:122; */ "Deadeye" = "Deadeye"; -/* stats.py: Exobiologist rank; In files: stats.py:119; */ +/* stats.py: Exobiologist rank; In files: stats.py:125; */ "Directionless" = "Directionless"; -/* stats.py: Exobiologist rank; In files: stats.py:120; */ +/* stats.py: Exobiologist rank; In files: stats.py:126; */ "Mostly Directionless" = "Mostly Directionless"; -/* stats.py: Exobiologist rank; In files: stats.py:121; */ +/* stats.py: Exobiologist rank; In files: stats.py:127; */ "Compiler" = "Compiler"; -/* stats.py: Exobiologist rank; In files: stats.py:122; */ +/* stats.py: Exobiologist rank; In files: stats.py:128; */ "Collector" = "Collector"; -/* stats.py: Exobiologist rank; In files: stats.py:123; */ +/* stats.py: Exobiologist rank; In files: stats.py:129; */ "Cataloguer" = "Cataloguer"; -/* stats.py: Exobiologist rank; In files: stats.py:124; */ +/* stats.py: Exobiologist rank; In files: stats.py:130; */ "Taxonomist" = "Taxonomist"; -/* stats.py: Exobiologist rank; In files: stats.py:125; */ +/* stats.py: Exobiologist rank; In files: stats.py:131; */ "Ecologist" = "Ecologist"; -/* stats.py: Exobiologist rank; In files: stats.py:126; */ +/* stats.py: Exobiologist rank; In files: stats.py:132; */ "Geneticist" = "Geneticist"; -/* stats.py: CQC rank; In files: stats.py:130; */ +/* stats.py: CQC rank; In files: stats.py:135; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:131; */ +/* stats.py: CQC rank; In files: stats.py:136; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:132; */ +/* stats.py: CQC rank; In files: stats.py:137; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:133; */ +/* stats.py: CQC rank; In files: stats.py:138; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:134; */ +/* stats.py: CQC rank; In files: stats.py:139; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:135; */ +/* stats.py: CQC rank; In files: stats.py:140; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:136; */ +/* stats.py: CQC rank; In files: stats.py:141; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:137; */ +/* stats.py: CQC rank; In files: stats.py:142; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:144; */ +/* stats.py: Federation rank; In files: stats.py:148; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:145; */ +/* stats.py: Federation rank; In files: stats.py:149; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:146; */ +/* stats.py: Federation rank; In files: stats.py:150; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:147; */ +/* stats.py: Federation rank; In files: stats.py:151; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:148; */ +/* stats.py: Federation rank; In files: stats.py:152; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:149; */ +/* stats.py: Federation rank; In files: stats.py:153; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:150; */ +/* stats.py: Federation rank; In files: stats.py:154; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:151; */ +/* stats.py: Federation rank; In files: stats.py:155; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:152; */ +/* stats.py: Federation rank; In files: stats.py:156; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:153; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:154; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:155; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:156; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:157; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:163; */ +/* stats.py: Empire rank; In files: stats.py:167; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:164; */ +/* stats.py: Empire rank; In files: stats.py:168; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:166; */ +/* stats.py: Empire rank; In files: stats.py:170; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:167; */ +/* stats.py: Empire rank; In files: stats.py:171; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:168; */ +/* stats.py: Empire rank; In files: stats.py:172; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:169; */ +/* stats.py: Empire rank; In files: stats.py:173; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:170; */ +/* stats.py: Empire rank; In files: stats.py:174; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:171; */ +/* stats.py: Empire rank; In files: stats.py:175; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:172; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:173; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:174; */ +/* stats.py: Empire rank; In files: stats.py:178; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:175; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:176; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:182; */ +/* stats.py: Power rank; In files: stats.py:186; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:183; */ +/* stats.py: Power rank; In files: stats.py:187; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:184; */ +/* stats.py: Power rank; In files: stats.py:188; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:185; */ +/* stats.py: Power rank; In files: stats.py:189; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:186; */ +/* stats.py: Power rank; In files: stats.py:190; */ "Rating 5" = "Rating 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:305; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:309; */ "Status: Don't yet know your Commander name" = "Status: Don't yet know your Commander name"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:313; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: No CAPI data yet" = "Status: No CAPI data yet"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:402; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:406; */ "Value" = "Value"; -/* stats.py: Status dialog title; In files: stats.py:411; */ +/* stats.py: Status dialog title; In files: stats.py:415; */ "Ships" = "Ships"; + diff --git a/stats.py b/stats.py index f48142aa..5a7d4641 100644 --- a/stats.py +++ b/stats.py @@ -54,6 +54,15 @@ def status(data: Dict[str, Any]) -> List[List[str]]: [_('Loan'), str(data['commander'].get('debt', 0))], # LANG: Cmdr stats ] + _ELITE_RANKS = [ + _('Elite'), # LANG: Top rank + _('Elite I'), # LANG: Top rank +1 + _('Elite II'), # LANG: Top rank +2 + _('Elite III'), # LANG: Top rank +3 + _('Elite IV'), # LANG: Top rank +4 + _('Elite V'), # LANG: Top rank +5 + ] + RANKS = [ # noqa: N806 # Its a constant, just needs to be updated at runtime # in output order (_('Combat'), 'combat'), # LANG: Ranking @@ -80,8 +89,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Master'), # LANG: Combat rank _('Dangerous'), # LANG: Combat rank _('Deadly'), # LANG: Combat rank - _('Elite'), # LANG: Top rank - ], + ] + _ELITE_RANKS, 'trade': [ _('Penniless'), # LANG: Trade rank _('Mostly Penniless'), # LANG: Trade rank @@ -91,8 +99,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Broker'), # LANG: Trade rank _('Entrepreneur'), # LANG: Trade rank _('Tycoon'), # LANG: Trade rank - _('Elite') # LANG: Top rank - ], + ] + _ELITE_RANKS, 'explore': [ _('Aimless'), # LANG: Explorer rank _('Mostly Aimless'), # LANG: Explorer rank @@ -102,8 +109,8 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Pathfinder'), # LANG: Explorer rank _('Ranger'), # LANG: Explorer rank _('Pioneer'), # LANG: Explorer rank - _('Elite') # LANG: Top rank - ], + + ] + _ELITE_RANKS, 'mercenary': [ _('Defenceless'), # LANG: Mercenary rank _('Mostly Defenceless'), # LANG: Mercenary rank @@ -113,8 +120,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Warrior'), # LANG: Mercenary rank _('Gunslinger'), # LANG: Mercenary rank _('Deadeye'), # LANG: Mercenary rank - _('Elite'), # LANG: Top rank - ], + ] + _ELITE_RANKS, 'exobiologist': [ _('Directionless'), # LANG: Exobiologist rank _('Mostly Directionless'), # LANG: Exobiologist rank @@ -124,8 +130,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Taxonomist'), # LANG: Exobiologist rank _('Ecologist'), # LANG: Exobiologist rank _('Geneticist'), # LANG: Exobiologist rank - _('Elite'), # LANG: Top rank - ], + ] + _ELITE_RANKS, 'cqc': [ _('Helpless'), # LANG: CQC rank _('Mostly Helpless'), # LANG: CQC rank @@ -135,8 +140,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Champion'), # LANG: CQC rank _('Hero'), # LANG: CQC rank _('Gladiator'), # LANG: CQC rank - _('Elite') # LANG: Top rank - ], + ] + _ELITE_RANKS, # http://elite-dangerous.wikia.com/wiki/Federation#Ranks 'federation': [ @@ -191,7 +195,6 @@ def status(data: Dict[str, Any]) -> List[List[str]]: for title, thing in RANKS: rank = ranks.get(thing) names = RANK_NAMES[thing] - # TODO: handle Elite I-V here. if isinstance(rank, int): res.append([title, names[rank] if rank < len(names) else f'Rank {rank}']) From cf4c2d18f1a9c094f216a8231770933a5eebaf2b Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 18:54:42 +0200 Subject: [PATCH 298/527] silence flake8 N806 --- stats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stats.py b/stats.py index 5a7d4641..6a8de02f 100644 --- a/stats.py +++ b/stats.py @@ -54,7 +54,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: [_('Loan'), str(data['commander'].get('debt', 0))], # LANG: Cmdr stats ] - _ELITE_RANKS = [ + _ELITE_RANKS = [ # noqa: N806 # Its a constant, just needs to be updated at runtime _('Elite'), # LANG: Top rank _('Elite I'), # LANG: Top rank +1 _('Elite II'), # LANG: Top rank +2 From 2a4199e098dfe2e2eed4538baf14f232b4a63ef9 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 19:13:32 +0200 Subject: [PATCH 299/527] de-magic-number row splitting --- stats.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/stats.py b/stats.py index 6a8de02f..563c7697 100644 --- a/stats.py +++ b/stats.py @@ -40,6 +40,13 @@ if platform == 'win32': CalculatePopupWindowPosition = None # type: ignore +CR_LINES_START = 1 +CR_LINES_END = 3 +RANK_LINES_START = 3 +RANK_LINES_END = 9 +POWERPLAY_LINES_START = 9 + + def status(data: Dict[str, Any]) -> List[List[str]]: """ Get the current status of the cmdr referred to by data. @@ -381,17 +388,16 @@ class StatsResults(tk.Toplevel): notebook = nb.Notebook(frame) page = self.addpage(notebook) - for thing in stats[1:3]: + for thing in stats[CR_LINES_START:CR_LINES_END]: # assumes things two and three are money self.addpagerow(page, [thing[0], self.credits(int(thing[1]))], with_copy=True) - # TODO: Headers, and a bit saner of some splitting up of things here self.addpagespacer(page) - for thing in stats[3:9]: + for thing in stats[RANK_LINES_START:RANK_LINES_END]: self.addpagerow(page, thing, with_copy=True) self.addpagespacer(page) - for thing in stats[9:]: + for thing in stats[POWERPLAY_LINES_START:]: self.addpagerow(page, thing, with_copy=True) ttk.Frame(page).grid(pady=5) # bottom spacer From ddcb5219b4425b932382f4e2c10b2747247ec347 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 19:23:22 +0200 Subject: [PATCH 300/527] fix mercenary rank, add some comments --- L10n/en.template | 218 +++++++++++++++++++++++------------------------ stats.py | 6 +- 2 files changed, 113 insertions(+), 111 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index 0ee1c172..f6ebd8e1 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -22,7 +22,7 @@ /* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map credentials"; -/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:52; */ +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ "Cmdr" = "Cmdr"; /* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ @@ -31,7 +31,7 @@ /* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ "API Key" = "API Key"; -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:147; stats.py:166; stats.py:185; stats.py:203; */ +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ "None" = "None"; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ @@ -136,16 +136,16 @@ /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:402; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Ship"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Suit"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:404; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:405; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Station"; /* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ @@ -172,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Save Raw Data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:399; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -223,13 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Fetching data..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:327; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Who are you?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:337; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Where are you?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:345; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "What are you flying?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -445,303 +445,303 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Disabled Plugins"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Balance"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Loan"; -/* stats.py: Top rank; In files: stats.py:58; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Top rank +1; In files: stats.py:59; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ "Elite I" = "Elite I"; -/* stats.py: Top rank +2; In files: stats.py:60; */ +/* stats.py: Top rank +2; In files: stats.py:67; */ "Elite II" = "Elite II"; -/* stats.py: Top rank +3; In files: stats.py:61; */ +/* stats.py: Top rank +3; In files: stats.py:68; */ "Elite III" = "Elite III"; -/* stats.py: Top rank +4; In files: stats.py:62; */ +/* stats.py: Top rank +4; In files: stats.py:69; */ "Elite IV" = "Elite IV"; -/* stats.py: Top rank +5; In files: stats.py:63; */ +/* stats.py: Top rank +5; In files: stats.py:70; */ "Elite V" = "Elite V"; -/* stats.py: Ranking; In files: stats.py:68; */ +/* stats.py: Ranking; In files: stats.py:76; */ "Combat" = "Combat"; -/* stats.py: Ranking; In files: stats.py:69; */ +/* stats.py: Ranking; In files: stats.py:77; */ "Trade" = "Trade"; -/* stats.py: Ranking; In files: stats.py:70; */ +/* stats.py: Ranking; In files: stats.py:78; */ "Explorer" = "Explorer"; -/* stats.py: Ranking; In files: stats.py:71; */ +/* stats.py: Ranking; In files: stats.py:79; */ "Mercenary" = "Mercenary"; -/* stats.py: Ranking; In files: stats.py:72; */ +/* stats.py: Ranking; In files: stats.py:80; */ "Exobiologist" = "Exobiologist"; -/* stats.py: Ranking; In files: stats.py:73; */ +/* stats.py: Ranking; In files: stats.py:81; */ "CQC" = "CQC"; -/* stats.py: Ranking; In files: stats.py:74; */ +/* stats.py: Ranking; In files: stats.py:82; */ "Federation" = "Federation"; -/* stats.py: Ranking; In files: stats.py:75; */ +/* stats.py: Ranking; In files: stats.py:83; */ "Empire" = "Empire"; -/* stats.py: Ranking; In files: stats.py:76; */ +/* stats.py: Ranking; In files: stats.py:84; */ "Powerplay" = "Powerplay"; -/* stats.py: Combat rank; In files: stats.py:84; */ +/* stats.py: Combat rank; In files: stats.py:93; */ "Harmless" = "Harmless"; -/* stats.py: Combat rank; In files: stats.py:85; */ +/* stats.py: Combat rank; In files: stats.py:94; */ "Mostly Harmless" = "Mostly Harmless"; -/* stats.py: Combat rank; In files: stats.py:86; */ +/* stats.py: Combat rank; In files: stats.py:95; */ "Novice" = "Novice"; -/* stats.py: Combat rank; In files: stats.py:87; */ +/* stats.py: Combat rank; In files: stats.py:96; */ "Competent" = "Competent"; -/* stats.py: Combat rank; In files: stats.py:88; */ +/* stats.py: Combat rank; In files: stats.py:97; */ "Expert" = "Expert"; -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:89; stats.py:169; */ +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ "Master" = "Master"; -/* stats.py: Combat rank; In files: stats.py:90; */ +/* stats.py: Combat rank; In files: stats.py:99; */ "Dangerous" = "Dangerous"; -/* stats.py: Combat rank; In files: stats.py:91; */ +/* stats.py: Combat rank; In files: stats.py:100; */ "Deadly" = "Deadly"; -/* stats.py: Trade rank; In files: stats.py:94; */ +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:95; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:96; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:97; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:98; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:99; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:100; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:101; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:104; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:105; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:106; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:107; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:108; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:109; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:110; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:111; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: Mercenary rank; In files: stats.py:115; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ "Defenceless" = "Defenceless"; -/* stats.py: Mercenary rank; In files: stats.py:116; */ +/* stats.py: Mercenary rank; In files: stats.py:125; */ "Mostly Defenceless" = "Mostly Defenceless"; -/* stats.py: Mercenary rank; In files: stats.py:117; */ +/* stats.py: Mercenary rank; In files: stats.py:126; */ "Rookie" = "Rookie"; -/* stats.py: Mercenary rank; In files: stats.py:118; */ +/* stats.py: Mercenary rank; In files: stats.py:127; */ "Soldier" = "Soldier"; -/* stats.py: Mercenary rank; In files: stats.py:119; stats.py:121; */ +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ "Gunslinger" = "Gunslinger"; -/* stats.py: Mercenary rank; In files: stats.py:120; */ +/* stats.py: Mercenary rank; In files: stats.py:129; */ "Warrior" = "Warrior"; -/* stats.py: Mercenary rank; In files: stats.py:122; */ +/* stats.py: Mercenary rank; In files: stats.py:131; */ "Deadeye" = "Deadeye"; -/* stats.py: Exobiologist rank; In files: stats.py:125; */ +/* stats.py: Exobiologist rank; In files: stats.py:134; */ "Directionless" = "Directionless"; -/* stats.py: Exobiologist rank; In files: stats.py:126; */ +/* stats.py: Exobiologist rank; In files: stats.py:135; */ "Mostly Directionless" = "Mostly Directionless"; -/* stats.py: Exobiologist rank; In files: stats.py:127; */ +/* stats.py: Exobiologist rank; In files: stats.py:136; */ "Compiler" = "Compiler"; -/* stats.py: Exobiologist rank; In files: stats.py:128; */ +/* stats.py: Exobiologist rank; In files: stats.py:137; */ "Collector" = "Collector"; -/* stats.py: Exobiologist rank; In files: stats.py:129; */ +/* stats.py: Exobiologist rank; In files: stats.py:138; */ "Cataloguer" = "Cataloguer"; -/* stats.py: Exobiologist rank; In files: stats.py:130; */ +/* stats.py: Exobiologist rank; In files: stats.py:139; */ "Taxonomist" = "Taxonomist"; -/* stats.py: Exobiologist rank; In files: stats.py:131; */ +/* stats.py: Exobiologist rank; In files: stats.py:140; */ "Ecologist" = "Ecologist"; -/* stats.py: Exobiologist rank; In files: stats.py:132; */ +/* stats.py: Exobiologist rank; In files: stats.py:141; */ "Geneticist" = "Geneticist"; -/* stats.py: CQC rank; In files: stats.py:135; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:136; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:137; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:138; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:139; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:140; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:141; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:142; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:148; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:149; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:150; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:151; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:152; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:153; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:154; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:155; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:156; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:157; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:158; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:159; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:160; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:161; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:167; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:168; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:170; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:171; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:172; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:173; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:174; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:175; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:176; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:177; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:178; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:179; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:180; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:186; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:187; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:188; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:189; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:190; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:309; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Status: Don't yet know your Commander name"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:317; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Status: No CAPI data yet"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:406; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Value"; -/* stats.py: Status dialog title; In files: stats.py:415; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Ships"; diff --git a/stats.py b/stats.py index 563c7697..ef993a53 100644 --- a/stats.py +++ b/stats.py @@ -72,10 +72,11 @@ def status(data: Dict[str, Any]) -> List[List[str]]: RANKS = [ # noqa: N806 # Its a constant, just needs to be updated at runtime # in output order + # Names we show people, vs internal names (_('Combat'), 'combat'), # LANG: Ranking (_('Trade'), 'trade'), # LANG: Ranking (_('Explorer'), 'explore'), # LANG: Ranking - (_('Mercenary'), 'mercenary'), # LANG: Ranking + (_('Mercenary'), 'soldier'), # LANG: Ranking (_('Exobiologist'), 'exobiologist'), # LANG: Ranking (_('CQC'), 'cqc'), # LANG: Ranking (_('Federation'), 'federation'), # LANG: Ranking @@ -86,6 +87,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: ] RANK_NAMES = { # noqa: N806 # Its a constant, just needs to be updated at runtime + # These names are the fdev side name (but lower()ed) # http://elite-dangerous.wikia.com/wiki/Pilots_Federation#Ranks 'combat': [ _('Harmless'), # LANG: Combat rank @@ -118,7 +120,7 @@ def status(data: Dict[str, Any]) -> List[List[str]]: _('Pioneer'), # LANG: Explorer rank ] + _ELITE_RANKS, - 'mercenary': [ + 'soldier': [ _('Defenceless'), # LANG: Mercenary rank _('Mostly Defenceless'), # LANG: Mercenary rank _('Rookie'), # LANG: Mercenary rank From 0c938bddfca4ea3eabbed815da47063c90046beb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 25 Jan 2022 17:43:04 +0000 Subject: [PATCH 301/527] Inara: API stated to not support compression --- plugins/inara.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/inara.py b/plugins/inara.py index 86e3ec25..2be87cea 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -1574,6 +1574,7 @@ def send_data(url: str, data: Mapping[str, Any]) -> bool: # noqa: CCR001 :param data: the data to POST :return: success state """ + # NB: As of 2022-01-25 Artie has stated the Inara API does *not* support compression r = this.session.post(url, data=json.dumps(data, separators=(',', ':')), timeout=_TIMEOUT) r.raise_for_status() reply = r.json() From d4c6cd94fea603b15864285597668c3240eee442 Mon Sep 17 00:00:00 2001 From: A_D Date: Sat, 22 Jan 2022 13:14:39 +0200 Subject: [PATCH 302/527] retry navroute parsing after failure --- monitor.py | 66 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/monitor.py b/monitor.py index ac3f55e1..01b70c74 100644 --- a/monitor.py +++ b/monitor.py @@ -10,7 +10,7 @@ from collections import OrderedDict, defaultdict from os import SEEK_END, SEEK_SET, listdir from os.path import basename, expanduser, isdir, join from sys import platform -from time import gmtime, localtime, sleep, strftime, strptime, time +from time import gmtime, localtime, mktime, sleep, strftime, strptime, time from typing import TYPE_CHECKING, Any, BinaryIO, Dict, List, MutableMapping, Optional from typing import OrderedDict as OrderedDictT from typing import Tuple @@ -23,8 +23,11 @@ from config import config from edmc_data import edmc_suit_shortnames, edmc_suit_symbol_localised from EDMCLogging import get_main_logger +# spell-checker: words navroute + logger = get_main_logger() STARTUP = 'journal.startup' +MAX_NAVROUTE_DISCREPANCY = 5 if TYPE_CHECKING: def _(x: str) -> str: @@ -111,6 +114,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.systempopulation: Optional[int] = None self.started: Optional[int] = None # Timestamp of the LoadGame event + self._navroute_retries = 0 + self.__init_state() def __init_state(self) -> None: @@ -167,6 +172,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below 'Dropship': None, # Best effort as to whether or not the above taxi is a dropship. 'Body': None, 'BodyType': None, + + 'NavRoute': None, } def start(self, root: 'tkinter.Tk') -> bool: # noqa: CCR001 @@ -494,6 +501,26 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below entry: MutableMapping[str, Any] = json.loads(line, object_pairs_hook=OrderedDict) entry['timestamp'] # we expect this to exist # TODO: replace with assert? or an if key in check + if self._navroute_retries > 0: + logger.debug(f'Navroute read retry [{self._navroute_retries}]') + self._navroute_retries -= 1 + nv_res = self._parse_navroute_file() + if ( + nv_res is None + or time() - mktime(strptime(nv_res['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) > MAX_NAVROUTE_DISCREPANCY + ): + logger.debug( + 'Failed to parse navroute. ' + 'trying again...' if self._navroute_retries > 0 else 'Giving up' + ) + + if self._navroute_retries == 0: + self.state['NavRoute'] = None + + else: + self.state['NavRoute'] = nv_res + logger.debug('successfully read navroute file') + self._navroute_retries = 0 + event_type = entry['event'].lower() if event_type == 'fileheader': self.live = False @@ -1306,16 +1333,26 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below elif event_type == 'navroute': # Added in ED 3.7 - multi-hop route details in NavRoute.json - with open(join(self.currentdir, 'NavRoute.json'), 'rb') as rf: # type: ignore - try: - entry = json.load(rf) + if (nv_json := self._parse_navroute_file()) is not None: + entry_time = mktime(strptime(nv_json['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) + c_time = time() - except json.JSONDecodeError: - logger.exception('Failed decoding NavRoute.json', exc_info=True) + if c_time - entry_time > MAX_NAVROUTE_DISCREPANCY: + logger.warning( + f'Parsed NavRoute.json timestamp is off by more than ' + f'{MAX_NAVROUTE_DISCREPANCY} ({c_time-entry_time=}).Trying again.' + ) + + self._navroute_retries = 10 else: + entry = nv_json self.state['NavRoute'] = entry + else: + logger.info('Failed to decode NavRoute.json. Trying again') + self._navroute_retries = 10 + elif event_type == 'moduleinfo': with open(join(self.currentdir, 'ModulesInfo.json'), 'rb') as mf: # type: ignore try: @@ -2157,6 +2194,23 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below return slots + def _parse_navroute_file(self) -> dict[str, Any] | None: + """Read and parse NavRoute.json.""" + if self.currentdir is None: + raise ValueError('currentdir unset') + + with open(join(self.currentdir, 'NavRoute.json'), 'r') as f: + raw = f.read() + + try: + data = json.loads(raw) + + except json.JSONDecodeError: + logger.exception('Failed to decode NavRoute.json', exc_info=True) + return None + + return data + # singleton monitor = EDLogs() From 06d4842da27b391b154e9b3c09a7ee7c4043f906 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 20:16:59 +0200 Subject: [PATCH 303/527] Be more parinoid about navroute files --- monitor.py | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/monitor.py b/monitor.py index 01b70c74..231871b8 100644 --- a/monitor.py +++ b/monitor.py @@ -115,6 +115,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.started: Optional[int] = None # Timestamp of the LoadGame event self._navroute_retries = 0 + self._navroute_orig_time: Optional[float] = None self.__init_state() @@ -505,9 +506,13 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below logger.debug(f'Navroute read retry [{self._navroute_retries}]') self._navroute_retries -= 1 nv_res = self._parse_navroute_file() + if self._navroute_orig_time is None: + logger.critical('Asked to retry for navroute but also no set time to compare? This is a bug.') + if ( nv_res is None - or time() - mktime(strptime(nv_res['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) > MAX_NAVROUTE_DISCREPANCY + or self._navroute_orig_time is None + or self._navroute_orig_time - self._parse_time(nv_res['timestamp']) > MAX_NAVROUTE_DISCREPANCY ): logger.debug( 'Failed to parse navroute. ' + 'trying again...' if self._navroute_retries > 0 else 'Giving up' @@ -520,6 +525,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.state['NavRoute'] = nv_res logger.debug('successfully read navroute file') self._navroute_retries = 0 + self._navroute_orig_time = None event_type = entry['event'].lower() if event_type == 'fileheader': @@ -1332,26 +1338,30 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.state['Taxi'] = False elif event_type == 'navroute': + # assume we've failed out the gate, then pull it back if things are fine + self._navroute_orig_time = mktime(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) + self._navroute_retries = 10 # Added in ED 3.7 - multi-hop route details in NavRoute.json - if (nv_json := self._parse_navroute_file()) is not None: - entry_time = mktime(strptime(nv_json['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) - c_time = time() + if (nv_json := self._parse_navroute_file()) is not None and 'timestamp' in nv_json: + file_time = mktime(strptime(nv_json['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) - if c_time - entry_time > MAX_NAVROUTE_DISCREPANCY: + if self._navroute_orig_time - file_time > MAX_NAVROUTE_DISCREPANCY: logger.warning( f'Parsed NavRoute.json timestamp is off by more than ' - f'{MAX_NAVROUTE_DISCREPANCY} ({c_time-entry_time=}).Trying again.' + f'{MAX_NAVROUTE_DISCREPANCY} ({self._navroute_orig_time-file_time=}).Trying again.' ) - self._navroute_retries = 10 - else: + # TODO: rather update entry here, overwriting existing fields but leaving others? + + # everything is happy, dont retry, dont set the original time, proceed as expected. entry = nv_json self.state['NavRoute'] = entry + self._navroute_retries = 0 + self._navroute_orig_time = None else: logger.info('Failed to decode NavRoute.json. Trying again') - self._navroute_retries = 10 elif event_type == 'moduleinfo': with open(join(self.currentdir, 'ModulesInfo.json'), 'rb') as mf: # type: ignore @@ -2194,11 +2204,14 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below return slots - def _parse_navroute_file(self) -> dict[str, Any] | None: + def _parse_navroute_file(self) -> Optional[dict[str, Any]]: """Read and parse NavRoute.json.""" if self.currentdir is None: raise ValueError('currentdir unset') + if not (pathlib.Path(self.currentdir) / 'NavRoute.json').exists(): + return None + with open(join(self.currentdir, 'NavRoute.json'), 'r') as f: raw = f.read() @@ -2209,8 +2222,15 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below logger.exception('Failed to decode NavRoute.json', exc_info=True) return None + if 'timestamp' not in data: # quick sanity check + return None + return data + @staticmethod + def _parse_time(source: str) -> float: + return mktime(strptime(source, '%Y-%m-%dT%H:%M:%SZ')) + # singleton monitor = EDLogs() From 36ecb69964d667570977170af62116005ae57ead Mon Sep 17 00:00:00 2001 From: A_D Date: Wed, 26 Jan 2022 13:17:27 +0200 Subject: [PATCH 304/527] refactor to use retry function for all attempts at navroute --- monitor.py | 97 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/monitor.py b/monitor.py index 231871b8..e01bfc41 100644 --- a/monitor.py +++ b/monitor.py @@ -502,30 +502,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below entry: MutableMapping[str, Any] = json.loads(line, object_pairs_hook=OrderedDict) entry['timestamp'] # we expect this to exist # TODO: replace with assert? or an if key in check - if self._navroute_retries > 0: - logger.debug(f'Navroute read retry [{self._navroute_retries}]') - self._navroute_retries -= 1 - nv_res = self._parse_navroute_file() - if self._navroute_orig_time is None: - logger.critical('Asked to retry for navroute but also no set time to compare? This is a bug.') - - if ( - nv_res is None - or self._navroute_orig_time is None - or self._navroute_orig_time - self._parse_time(nv_res['timestamp']) > MAX_NAVROUTE_DISCREPANCY - ): - logger.debug( - 'Failed to parse navroute. ' + 'trying again...' if self._navroute_retries > 0 else 'Giving up' - ) - - if self._navroute_retries == 0: - self.state['NavRoute'] = None - - else: - self.state['NavRoute'] = nv_res - logger.debug('successfully read navroute file') - self._navroute_retries = 0 - self._navroute_orig_time = None + self.__navroute_retry() event_type = entry['event'].lower() if event_type == 'fileheader': @@ -1340,28 +1317,12 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below elif event_type == 'navroute': # assume we've failed out the gate, then pull it back if things are fine self._navroute_orig_time = mktime(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) - self._navroute_retries = 10 + self._navroute_retries = 11 + # Added in ED 3.7 - multi-hop route details in NavRoute.json - if (nv_json := self._parse_navroute_file()) is not None and 'timestamp' in nv_json: - file_time = mktime(strptime(nv_json['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) - - if self._navroute_orig_time - file_time > MAX_NAVROUTE_DISCREPANCY: - logger.warning( - f'Parsed NavRoute.json timestamp is off by more than ' - f'{MAX_NAVROUTE_DISCREPANCY} ({self._navroute_orig_time-file_time=}).Trying again.' - ) - - else: - # TODO: rather update entry here, overwriting existing fields but leaving others? - - # everything is happy, dont retry, dont set the original time, proceed as expected. - entry = nv_json - self.state['NavRoute'] = entry - self._navroute_retries = 0 - self._navroute_orig_time = None - - else: - logger.info('Failed to decode NavRoute.json. Trying again') + # rather than duplicating this, lets just call the function + if self.__navroute_retry(): + entry = self.state['NavRoute'] elif event_type == 'moduleinfo': with open(join(self.currentdir, 'ModulesInfo.json'), 'rb') as mf: # type: ignore @@ -2212,8 +2173,14 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below if not (pathlib.Path(self.currentdir) / 'NavRoute.json').exists(): return None - with open(join(self.currentdir, 'NavRoute.json'), 'r') as f: - raw = f.read() + try: + + with open(join(self.currentdir, 'NavRoute.json'), 'r') as f: + raw = f.read() + + except Exception as e: + logger.exception(f'Could not open navroute file. Bailing: {e}') + return None try: data = json.loads(raw) @@ -2231,6 +2198,42 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below def _parse_time(source: str) -> float: return mktime(strptime(source, '%Y-%m-%dT%H:%M:%SZ')) + def __navroute_retry(self) -> bool: + """Retry reading navroute files.""" + if self._navroute_retries == 0: + return False + + logger.info(f'Navroute read retry [{self._navroute_retries}]') + self._navroute_retries -= 1 + + if self._navroute_orig_time is None: + logger.critical('Asked to retry for navroute but also no set time to compare? This is a bug.') + return False + + if (file := self._parse_navroute_file()) is None: + logger.debug( + 'Failed to parse NavRoute.json. ' + + ('Trying again' if self._navroute_retries > 0 else 'Giving up') + ) + return False + + # _parse_navroute_file verifies that this exists for us + file_time = self._parse_time(file['timestamp']) + if abs(file_time - self._navroute_orig_time) > MAX_NAVROUTE_DISCREPANCY: + logger.debug( + f'Time discrepancy of more than {MAX_NAVROUTE_DISCREPANCY}s --' + f' ({abs(file_time - self._navroute_orig_time)}).' + f' {"Trying again" if self._navroute_retries > 0 else "Giving up"}.' + ) + return False + + # everything is good, lets set what we need to and make sure we dont try again + logger.info('Successfully read NavRoute file for last NavRoute event.') + self.state['NavRoute'] = file + self._navroute_retries = 0 + self._navroute_orig_time = None + return True + # singleton monitor = EDLogs() From 62a0a96dc646863bd0ea01e8f0419b4a581ba690 Mon Sep 17 00:00:00 2001 From: A_D Date: Wed, 26 Jan 2022 17:42:50 +0200 Subject: [PATCH 305/527] resolve final review comments --- monitor.py | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/monitor.py b/monitor.py index e01bfc41..f5e9a3ac 100644 --- a/monitor.py +++ b/monitor.py @@ -114,8 +114,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.systempopulation: Optional[int] = None self.started: Optional[int] = None # Timestamp of the LoadGame event - self._navroute_retries = 0 - self._navroute_orig_time: Optional[float] = None + self._navroute_retries_remaining = 0 + self._last_navroute_journal_timestamp: Optional[float] = None self.__init_state() @@ -1316,8 +1316,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below elif event_type == 'navroute': # assume we've failed out the gate, then pull it back if things are fine - self._navroute_orig_time = mktime(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) - self._navroute_retries = 11 + self._last_navroute_journal_timestamp = mktime(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) + self._navroute_retries_remaining = 11 # Added in ED 3.7 - multi-hop route details in NavRoute.json # rather than duplicating this, lets just call the function @@ -2170,9 +2170,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below if self.currentdir is None: raise ValueError('currentdir unset') - if not (pathlib.Path(self.currentdir) / 'NavRoute.json').exists(): - return None - try: with open(join(self.currentdir, 'NavRoute.json'), 'r') as f: @@ -2195,43 +2192,43 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below return data @staticmethod - def _parse_time(source: str) -> float: + def _parse_journal_timestamp(source: str) -> float: return mktime(strptime(source, '%Y-%m-%dT%H:%M:%SZ')) def __navroute_retry(self) -> bool: """Retry reading navroute files.""" - if self._navroute_retries == 0: + if self._navroute_retries_remaining == 0: return False - logger.info(f'Navroute read retry [{self._navroute_retries}]') - self._navroute_retries -= 1 + logger.info(f'Navroute read retry [{self._navroute_retries_remaining}]') + self._navroute_retries_remaining -= 1 - if self._navroute_orig_time is None: + if self._last_navroute_journal_timestamp is None: logger.critical('Asked to retry for navroute but also no set time to compare? This is a bug.') return False if (file := self._parse_navroute_file()) is None: logger.debug( 'Failed to parse NavRoute.json. ' - + ('Trying again' if self._navroute_retries > 0 else 'Giving up') + + ('Trying again' if self._navroute_retries_remaining > 0 else 'Giving up') ) return False # _parse_navroute_file verifies that this exists for us - file_time = self._parse_time(file['timestamp']) - if abs(file_time - self._navroute_orig_time) > MAX_NAVROUTE_DISCREPANCY: + file_time = self._parse_journal_timestamp(file['timestamp']) + if abs(file_time - self._last_navroute_journal_timestamp) > MAX_NAVROUTE_DISCREPANCY: logger.debug( f'Time discrepancy of more than {MAX_NAVROUTE_DISCREPANCY}s --' - f' ({abs(file_time - self._navroute_orig_time)}).' - f' {"Trying again" if self._navroute_retries > 0 else "Giving up"}.' + f' ({abs(file_time - self._last_navroute_journal_timestamp)}).' + f' {"Trying again" if self._navroute_retries_remaining > 0 else "Giving up"}.' ) return False # everything is good, lets set what we need to and make sure we dont try again logger.info('Successfully read NavRoute file for last NavRoute event.') self.state['NavRoute'] = file - self._navroute_retries = 0 - self._navroute_orig_time = None + self._navroute_retries_remaining = 0 + self._last_navroute_journal_timestamp = None return True From e98aec0169ed85267ab86941ad272a8bdf7af518 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 26 Jan 2022 16:38:01 +0000 Subject: [PATCH 306/527] monitor: Comment what MAX_NAVROUTE_DISCREPANCY is So as to disambiguate from "some discrepancy within the route data". --- monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index f5e9a3ac..42d282b1 100644 --- a/monitor.py +++ b/monitor.py @@ -27,7 +27,7 @@ from EDMCLogging import get_main_logger logger = get_main_logger() STARTUP = 'journal.startup' -MAX_NAVROUTE_DISCREPANCY = 5 +MAX_NAVROUTE_DISCREPANCY = 5 # Timestamp difference in seconds if TYPE_CHECKING: def _(x: str) -> str: From eb28a3b502f7881f08a9d4da02d4b891fd89c9d5 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 13:04:22 +0200 Subject: [PATCH 307/527] Use sys.platform, minor type updates --- monitor.py | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/monitor.py b/monitor.py index 42d282b1..be52290a 100644 --- a/monitor.py +++ b/monitor.py @@ -1,15 +1,18 @@ """Monitor for new Journal files and contents of latest.""" +# v [sic] +# spell-checker: words onfoot unforseen relog fsdjump suitloadoutid slotid suitid loadoutid fauto Intimidator +# spell-checker: words joinacrew quitacrew sellshiponrebuy newbal navroute npccrewpaidwage sauto import json import pathlib import queue import re +import sys import threading from calendar import timegm from collections import OrderedDict, defaultdict from os import SEEK_END, SEEK_SET, listdir from os.path import basename, expanduser, isdir, join -from sys import platform from time import gmtime, localtime, mktime, sleep, strftime, strptime, time from typing import TYPE_CHECKING, Any, BinaryIO, Dict, List, MutableMapping, Optional from typing import OrderedDict as OrderedDictT @@ -33,7 +36,7 @@ if TYPE_CHECKING: def _(x: str) -> str: return x -if platform == 'darwin': +if sys.platform == 'darwin': from fcntl import fcntl from AppKit import NSWorkspace @@ -41,7 +44,7 @@ if platform == 'darwin': from watchdog.observers import Observer F_GLOBAL_NOCACHE = 55 -elif platform == 'win32': +elif sys.platform == 'win32': import ctypes from ctypes.wintypes import BOOL, HWND, LPARAM, LPWSTR @@ -62,6 +65,10 @@ elif platform == 'win32': else: # Linux's inotify doesn't work over CIFS or NFS, so poll FileSystemEventHandler = object # dummy + if TYPE_CHECKING: + # this isn't ever used, but this will make type checking happy + from watchdog.events import FileCreatedEvent + from watchdog.observers import Observer # Journal handler @@ -223,7 +230,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below # File system events are unreliable/non-existent over network drives on Linux. # We can't easily tell whether a path points to a network drive, so assume # any non-standard logdir might be on a network drive and poll instead. - polling = bool(config.get_str('journaldir')) and platform != 'win32' + polling = bool(config.get_str('journaldir')) and sys.platform != 'win32' if not polling and not self.observer: logger.debug('Not polling, no observer, starting an observer...') self.observer = Observer() @@ -280,6 +287,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below if self.observed: logger.debug('self.observed: Calling unschedule_all()') self.observed = None + assert self.observer is not None, 'Observer was none but it is in use?' self.observer.unschedule_all() logger.debug('Done') @@ -339,7 +347,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below logfile = self.logfile if logfile: loghandle: BinaryIO = open(logfile, 'rb', 0) # unbuffered - if platform == 'darwin': + if sys.platform == 'darwin': fcntl(loghandle, F_GLOBAL_NOCACHE, -1) # required to avoid corruption on macOS over SMB for line in loghandle: @@ -390,9 +398,13 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.event_queue.put(None) self.live = False + emitter = None # Watchdog thread -- there is a way to get this by using self.observer.emitters and checking for an attribute: # watch, but that may have unforseen differences in behaviour. - emitter = self.observed and self.observer._emitter_for_watch[self.observed] # Note: Uses undocumented attribute + if self.observed: + assert self.observer is not None, 'self.observer is None but also in use?' + # Note: Uses undocumented attribute + emitter = self.observed and self.observer._emitter_for_watch[self.observed] logger.debug('Entering loop...') while True: @@ -448,7 +460,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below if logfile: loghandle = open(logfile, 'rb', 0) # unbuffered - if platform == 'darwin': + if sys.platform == 'darwin': fcntl(loghandle, F_GLOBAL_NOCACHE, -1) # required to avoid corruption on macOS over SMB log_pos = 0 @@ -695,7 +707,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below # This event is logged when a player (on foot) gets into a ship or SRV # Parameters: # • SRV: true if getting into SRV, false if getting into a ship - # • Taxi: true when boarding a taxi transposrt ship + # • Taxi: true when boarding a taxi transport ship # • Multicrew: true when boarding another player’s vessel # • ID: player’s ship ID (if players own vessel) # • StarSystem @@ -723,7 +735,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below # # Parameters: # • SRV: true if getting out of SRV, false if getting out of a ship - # • Taxi: true when getting out of a taxi transposrt ship + # • Taxi: true when getting out of a taxi transport ship # • Multicrew: true when getting out of another player’s vessel # • ID: player’s ship ID (if players own vessel) # • StarSystem @@ -1938,12 +1950,12 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below :return: bool - True if the game is running. """ - if platform == 'darwin': + if sys.platform == 'darwin': for app in NSWorkspace.sharedWorkspace().runningApplications(): if app.bundleIdentifier() == 'uk.co.frontier.EliteDangerous': return True - elif platform == 'win32': + elif sys.platform == 'win32': def WindowTitle(h): # noqa: N802 # type: ignore if h: length = GetWindowTextLength(h) + 1 From 86292e02e2f9443640060ee83dcc083566d9a402 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 13:40:36 +0200 Subject: [PATCH 308/527] Move config to module, separate out implementation Does what it says on the tin. Moves config implementations out to individual files, guards those around platforms to make stuff more reasonably split out. --- config.py | 1115 -------------------------------------------- config/__init__.py | 473 +++++++++++++++++++ config/darwin.py | 184 ++++++++ config/linux.py | 245 ++++++++++ config/windows.py | 259 ++++++++++ 5 files changed, 1161 insertions(+), 1115 deletions(-) delete mode 100644 config.py create mode 100644 config/__init__.py create mode 100644 config/darwin.py create mode 100644 config/linux.py create mode 100644 config/windows.py diff --git a/config.py b/config.py deleted file mode 100644 index b32b2613..00000000 --- a/config.py +++ /dev/null @@ -1,1115 +0,0 @@ -""" -Code dealing with the configuration of the program. - -Windows uses the Registry to store values in a flat manner. -Linux uses a file, but for commonality it's still a flat data structure. -macOS uses a 'defaults' object. -""" - -# spell-checker: words HKEY FOLDERID wchar wstring edcdhkey - -import abc -import contextlib -import functools -import logging -import os -import pathlib -import re -import subprocess -import sys -import traceback -import warnings -from abc import abstractmethod -from sys import platform -from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Type, TypeVar, Union - -import semantic_version - -from constants import GITVERSION_FILE, applongname, appname - -# Any of these may be imported by plugins -appcmdname = 'EDMC' -# appversion **MUST** follow Semantic Versioning rules: -# -# Major.Minor.Patch(-prerelease)(+buildmetadata) -# NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta4' -_cached_version: Optional[semantic_version.Version] = None -copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' - -update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml' -update_interval = 8*60*60 -# Providers marked to be in debug mode. Generally this is expected to switch to sending data to a log file -debug_senders: List[str] = [] -# TRACE logging code that should actually be used. Means not spamming it -# *all* if only interested in some things. -trace_on: List[str] = [] - -capi_pretend_down: bool = False -capi_debug_access_token: Optional[str] = None -# This must be done here in order to avoid an import cycle with EDMCLogging. -# Other code should use EDMCLogging.get_main_logger -if os.getenv("EDMC_NO_UI"): - logger = logging.getLogger(appcmdname) - -else: - logger = logging.getLogger(appname) - -if platform == 'darwin': - from Foundation import ( # type: ignore - NSApplicationSupportDirectory, NSBundle, NSDocumentDirectory, NSSearchPathForDirectoriesInDomains, - NSUserDefaults, NSUserDomainMask - ) - -elif platform == 'win32': - import ctypes - import uuid - import winreg - from ctypes.wintypes import DWORD, HANDLE - if TYPE_CHECKING: - import ctypes.windll # type: ignore - - REG_RESERVED_ALWAYS_ZERO = 0 - - # This is the only way to do this from python without external deps (which do this anyway). - FOLDERID_Documents = uuid.UUID('{FDD39AD0-238F-46AF-ADB4-6C85480369C7}') - FOLDERID_LocalAppData = uuid.UUID('{F1B32785-6FBA-4FCF-9D55-7B8E7F157091}') - FOLDERID_Profile = uuid.UUID('{5E6C858F-0E22-4760-9AFE-EA3317B67173}') - FOLDERID_SavedGames = uuid.UUID('{4C5C32FF-BB9D-43b0-B5B4-2D72E54EAAA4}') - - SHGetKnownFolderPath = ctypes.windll.shell32.SHGetKnownFolderPath - SHGetKnownFolderPath.argtypes = [ctypes.c_char_p, DWORD, HANDLE, ctypes.POINTER(ctypes.c_wchar_p)] - - CoTaskMemFree = ctypes.windll.ole32.CoTaskMemFree - CoTaskMemFree.argtypes = [ctypes.c_void_p] - - def known_folder_path(guid: uuid.UUID) -> Optional[str]: - """Look up a Windows GUID to actual folder path name.""" - buf = ctypes.c_wchar_p() - if SHGetKnownFolderPath(ctypes.create_string_buffer(guid.bytes_le), 0, 0, ctypes.byref(buf)): - return None - retval = buf.value # copy data - CoTaskMemFree(buf) # and free original - return retval - -elif platform == 'linux': - from configparser import ConfigParser - - -_T = TypeVar('_T') - - -########################################################################### -def git_shorthash_from_head() -> str: - """ - Determine short hash for current git HEAD. - - Includes `.DIRTY` if any changes have been made from HEAD - - :return: str - None if we couldn't determine the short hash. - """ - shorthash: str = None # type: ignore - - try: - git_cmd = subprocess.Popen('git rev-parse --short HEAD'.split(), - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) - out, err = git_cmd.communicate() - - except Exception as e: - logger.info(f"Couldn't run git command for short hash: {e!r}") - - else: - shorthash = out.decode().rstrip('\n') - if re.match(r'^[0-9a-f]{7,}$', shorthash) is None: - logger.error(f"'{shorthash}' doesn't look like a valid git short hash, forcing to None") - shorthash = None # type: ignore - - if shorthash is not None: - with contextlib.suppress(Exception): - result = subprocess.run('git diff --stat HEAD'.split(), capture_output=True) - if len(result.stdout) > 0: - shorthash += '.DIRTY' - - if len(result.stderr) > 0: - logger.warning(f'Data from git on stderr:\n{str(result.stderr)}') - - return shorthash - - -def appversion() -> semantic_version.Version: - """ - Determine app version including git short hash if possible. - - :return: The augmented app version. - """ - global _cached_version - if _cached_version is not None: - return _cached_version - - if getattr(sys, 'frozen', False): - # Running frozen, so we should have a .gitversion file - # Yes, .parent because if frozen we're inside library.zip - with open(pathlib.Path(sys.path[0]).parent / GITVERSION_FILE, 'r', encoding='utf-8') as gitv: - shorthash = gitv.read() - - else: - # Running from source - shorthash = git_shorthash_from_head() - if shorthash is None: - shorthash = 'UNKNOWN' - - _cached_version = semantic_version.Version(f'{_static_appversion}+{shorthash}') - return _cached_version - - -user_agent = f'EDCD-{appname}-{appversion()}' - - -def appversion_nobuild() -> semantic_version.Version: - """ - Determine app version without *any* build meta data. - - This will not only strip any added git short hash, but also any trailing - '+' in _static_appversion. - - :return: App version without any build meta data. - """ - return appversion().truncate('prerelease') -########################################################################### - - -class AbstractConfig(abc.ABC): - """Abstract root class of all platform specific Config implementations.""" - - OUT_MKT_EDDN = 1 - # OUT_MKT_BPC = 2 # No longer supported - OUT_MKT_TD = 4 - OUT_MKT_CSV = 8 - OUT_SHIP = 16 - # OUT_SHIP_EDS = 16 # Replaced by OUT_SHIP - # OUT_SYS_FILE = 32 # No longer supported - # OUT_STAT = 64 # No longer available - # OUT_SHIP_CORIOLIS = 128 # Replaced by OUT_SHIP - OUT_STATION_ANY = OUT_MKT_EDDN | OUT_MKT_TD | OUT_MKT_CSV - # OUT_SYS_EDSM = 256 # Now a plugin - # OUT_SYS_AUTO = 512 # Now always automatic - OUT_MKT_MANUAL = 1024 - OUT_SYS_EDDN = 2048 - OUT_SYS_DELAY = 4096 - - app_dir_path: pathlib.Path - plugin_dir_path: pathlib.Path - internal_plugin_dir_path: pathlib.Path - respath_path: pathlib.Path - home_path: pathlib.Path - default_journal_dir_path: pathlib.Path - - identifier: str - - __in_shutdown = False # Is the application currently shutting down ? - __auth_force_localserver = False # Should we use localhost for auth callback ? - __auth_force_edmc_protocol = False # Should we force edmc:// protocol ? - __eddn_url = None # Non-default EDDN URL - __eddn_tracking_ui = False # Show EDDN tracking UI ? - - def __init__(self) -> None: - self.home_path = pathlib.Path.home() - - def set_shutdown(self): - """Set flag denoting we're in the shutdown sequence.""" - self.__in_shutdown = True - - @property - def shutting_down(self) -> bool: - """ - Determine if we're in the shutdown sequence. - - :return: bool - True if in shutdown sequence. - """ - return self.__in_shutdown - - def set_auth_force_localserver(self): - """Set flag to force use of localhost web server for Frontier Auth callback.""" - self.__auth_force_localserver = True - - @property - def auth_force_localserver(self) -> bool: - """ - Determine if use of localhost is forced for Frontier Auth callback. - - :return: bool - True if we should use localhost web server. - """ - return self.__auth_force_localserver - - def set_auth_force_edmc_protocol(self): - """Set flag to force use of localhost web server for Frontier Auth callback.""" - self.__auth_force_edmc_protocol = True - - @property - def auth_force_edmc_protocol(self) -> bool: - """ - Determine if use of localhost is forced for Frontier Auth callback. - - :return: bool - True if we should use localhost web server. - """ - return self.__auth_force_edmc_protocol - - def set_eddn_url(self, eddn_url: str): - """Set the specified eddn URL.""" - self.__eddn_url = eddn_url - - @property - def eddn_url(self) -> Optional[str]: - """ - Provide the custom EDDN URL. - - :return: str - Custom EDDN URL to use. - """ - return self.__eddn_url - - def set_eddn_tracking_ui(self): - """Activate EDDN tracking UI.""" - self.__eddn_tracking_ui = True - - @property - def eddn_tracking_ui(self) -> bool: - """ - Determine if the EDDN tracking UI be shown. - - :return: bool - Should tracking UI be active? - """ - return self.__eddn_tracking_ui - - @property - def app_dir(self) -> str: - """Return a string version of app_dir.""" - return str(self.app_dir_path) - - @property - def plugin_dir(self) -> str: - """Return a string version of plugin_dir.""" - return str(self.plugin_dir_path) - - @property - def internal_plugin_dir(self) -> str: - """Return a string version of internal_plugin_dir.""" - return str(self.internal_plugin_dir_path) - - @property - def respath(self) -> str: - """Return a string version of respath.""" - return str(self.respath_path) - - @property - def home(self) -> str: - """Return a string version of home.""" - return str(self.home_path) - - @property - def default_journal_dir(self) -> str: - """Return a string version of default_journal_dir.""" - return str(self.default_journal_dir_path) - - @staticmethod - def _suppress_call( - func: Callable[..., _T], exceptions: Union[Type[BaseException], List[Type[BaseException]]] = Exception, - *args: Any, **kwargs: Any - ) -> Optional[_T]: - if exceptions is None: - exceptions = [Exception] - - if not isinstance(exceptions, list): - exceptions = [exceptions] - - with contextlib.suppress(*exceptions): # type: ignore # it works fine, mypy - return func(*args, **kwargs) - - return None - - def get(self, key: str, default: Union[list, str, bool, int] = None) -> Union[list, str, bool, int]: - """ - Return the data for the requested key, or a default. - - :param key: The key data is being requested for. - :param default: The default to return if the key does not exist, defaults to None. - :raises OSError: On Windows, if a Registry error occurs. - :return: The data or the default. - """ - warnings.warn(DeprecationWarning('get is Deprecated. use the specific getter for your type')) - logger.debug('Attempt to use Deprecated get() method\n' + ''.join(traceback.format_stack())) - - if (l := self._suppress_call(self.get_list, ValueError, key, default=None)) is not None: - return l - - elif (s := self._suppress_call(self.get_str, ValueError, key, default=None)) is not None: - return s - - elif (b := self._suppress_call(self.get_bool, ValueError, key, default=None)) is not None: - return b - - elif (i := self._suppress_call(self.get_int, ValueError, key, default=None)) is not None: - return i - - return default # type: ignore - - @abstractmethod - def get_list(self, key: str, *, default: list = None) -> list: - """ - Return the list referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_list`. - """ - raise NotImplementedError - - @abstractmethod - def get_str(self, key: str, *, default: str = None) -> str: - """ - Return the string referred to by the given key if it exists, or the default. - - :param key: The key data is being requested for. - :param default: Default to return if the key does not exist, defaults to None. - :raises ValueError: If an internal error occurs getting or converting a value. - :raises OSError: On Windows, if a Registry error occurs. - :return: The requested data or the default. - """ - raise NotImplementedError - - @abstractmethod - def get_bool(self, key: str, *, default: bool = None) -> bool: - """ - Return the bool referred to by the given key if it exists, or the default. - - :param key: The key data is being requested for. - :param default: Default to return if the key does not exist, defaults to None - :raises ValueError: If an internal error occurs getting or converting a value - :raises OSError: On Windows, if a Registry error occurs. - :return: The requested data or the default - """ - raise NotImplementedError - - def getint(self, key: str, *, default: int = 0) -> int: - """ - Getint is a Deprecated getter method. - - See get_int for its replacement. - :raises OSError: On Windows, if a Registry error occurs. - """ - warnings.warn(DeprecationWarning('getint is Deprecated. Use get_int instead')) - logger.debug('Attempt to use Deprecated getint() method\n' + ''.join(traceback.format_stack())) - - return self.get_int(key, default=default) - - @abstractmethod - def get_int(self, key: str, *, default: int = 0) -> int: - """ - Return the int referred to by key if it exists in the config. - - For legacy reasons, the default is 0 and not None. - - :param key: The key data is being requested for. - :param default: Default to return if the key does not exist, defaults to 0. - :raises ValueError: If the internal representation of this key cannot be converted to an int. - :raises OSError: On Windows, if a Registry error occurs. - :return: The requested data or the default. - """ - raise NotImplementedError - - @abstractmethod - def set(self, key: str, val: Union[int, str, List[str], bool]) -> None: - """ - Set the given key's data to the given value. - - :param key: The key to set the value on. - :param val: The value to set the key's data to. - :raises ValueError: On an invalid type. - :raises OSError: On Windows, if a Registry error occurs. - """ - raise NotImplementedError - - @abstractmethod - def delete(self, key: str, *, suppress=False) -> None: - """ - Delete the given key from the config. - - :param key: The key to delete. - :param suppress: bool - Whether to suppress any errors. Useful in case - code to migrate settings is blindly removing an old key. - :raises OSError: On Windows, if a registry error occurs. - """ - raise NotImplementedError - - @abstractmethod - def save(self) -> None: - """ - Save the current configuration. - - :raises OSError: On Windows, if a Registry error occurs. - """ - raise NotImplementedError - - @abstractmethod - def close(self) -> None: - """Close this config and release any associated resources.""" - raise NotImplementedError - - def get_password(self, account: str) -> None: - """Legacy password retrieval.""" - warnings.warn("password subsystem is no longer supported", DeprecationWarning) - - def set_password(self, account: str, password: str) -> None: - """Legacy password setting.""" - warnings.warn("password subsystem is no longer supported", DeprecationWarning) - - def delete_password(self, account: str) -> None: - """Legacy password deletion.""" - warnings.warn("password subsystem is no longer supported", DeprecationWarning) - - -class WinConfig(AbstractConfig): - """Implementation of AbstractConfig for Windows.""" - - def __init__(self, do_winsparkle=True) -> None: - self.app_dir_path = pathlib.Path(str(known_folder_path(FOLDERID_LocalAppData))) / appname - self.app_dir_path.mkdir(exist_ok=True) - - self.plugin_dir_path = self.app_dir_path / 'plugins' - self.plugin_dir_path.mkdir(exist_ok=True) - - if getattr(sys, 'frozen', False): - self.respath_path = pathlib.Path(sys.executable).parent - self.internal_plugin_dir_path = self.respath_path / 'plugins' - - else: - self.respath_path = pathlib.Path(__file__).parent - self.internal_plugin_dir_path = self.respath_path / 'plugins' - - self.home_path = pathlib.Path.home() - - journal_dir_str = known_folder_path(FOLDERID_SavedGames) - journaldir = pathlib.Path(journal_dir_str) if journal_dir_str is not None else None - self.default_journal_dir_path = None # type: ignore - if journaldir is not None: - self.default_journal_dir_path = journaldir / 'Frontier Developments' / 'Elite Dangerous' - - create_key_defaults = functools.partial( - winreg.CreateKeyEx, - key=winreg.HKEY_CURRENT_USER, - access=winreg.KEY_ALL_ACCESS | winreg.KEY_WOW64_64KEY, - ) - - try: - self.__reg_handle: winreg.HKEYType = create_key_defaults( - sub_key=r'Software\Marginal\EDMarketConnector' - ) - if do_winsparkle: - self.__setup_winsparkle() - - except OSError: - logger.exception('could not create required registry keys') - raise - - self.identifier = applongname - if (outdir_str := self.get_str('outdir')) is None or not pathlib.Path(outdir_str).is_dir(): - docs = known_folder_path(FOLDERID_Documents) - self.set('outdir', docs if docs is not None else self.home) - - def __setup_winsparkle(self): - """Ensure the necessary Registry keys for WinSparkle are present.""" - create_key_defaults = functools.partial( - winreg.CreateKeyEx, - key=winreg.HKEY_CURRENT_USER, - access=winreg.KEY_ALL_ACCESS | winreg.KEY_WOW64_64KEY, - ) - try: - edcd_handle: winreg.HKEYType = create_key_defaults(sub_key=r'Software\EDCD\EDMarketConnector') - winsparkle_reg: winreg.HKEYType = winreg.CreateKeyEx( - edcd_handle, sub_key='WinSparkle', access=winreg.KEY_ALL_ACCESS | winreg.KEY_WOW64_64KEY - ) - - except OSError: - logger.exception('could not open WinSparkle handle') - raise - - # set WinSparkle defaults - https://github.com/vslavik/winsparkle/wiki/Registry-Settings - winreg.SetValueEx( - winsparkle_reg, 'UpdateInterval', REG_RESERVED_ALWAYS_ZERO, winreg.REG_SZ, str(update_interval) - ) - - try: - winreg.QueryValueEx(winsparkle_reg, 'CheckForUpdates') - - except FileNotFoundError: - # Key doesn't exist, set it to a default - winreg.SetValueEx(winsparkle_reg, 'CheckForUpdates', REG_RESERVED_ALWAYS_ZERO, winreg.REG_SZ, '1') - - winsparkle_reg.Close() - edcd_handle.Close() - - def __get_regentry(self, key: str) -> Union[None, list, str, int]: - """Access the Registry for the raw entry.""" - try: - value, _type = winreg.QueryValueEx(self.__reg_handle, key) - except FileNotFoundError: - # Key doesn't exist - return None - - # The type returned is actually as we'd expect for each of these. The casts are here for type checkers and - # For programmers who want to actually know what is going on - if _type == winreg.REG_SZ: - return str(value) - - elif _type == winreg.REG_DWORD: - return int(value) - - elif _type == winreg.REG_MULTI_SZ: - return list(value) - - else: - logger.warning(f'registry key {key=} returned unknown type {_type=} {value=}') - return None - - def get_str(self, key: str, *, default: str = None) -> str: - """ - Return the string referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_str`. - """ - res = self.__get_regentry(key) - if res is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - elif not isinstance(res, str): - raise ValueError(f'Data from registry is not a string: {type(res)=} {res=}') - - return res - - def get_list(self, key: str, *, default: list = None) -> list: - """ - Return the list referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_list`. - """ - res = self.__get_regentry(key) - if res is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - elif not isinstance(res, list): - raise ValueError(f'Data from registry is not a list: {type(res)=} {res}') - - return res - - def get_int(self, key: str, *, default: int = 0) -> int: - """ - Return the int referred to by key if it exists in the config. - - Implements :meth:`AbstractConfig.get_int`. - """ - res = self.__get_regentry(key) - if res is None: - return default - - if not isinstance(res, int): - raise ValueError(f'Data from registry is not an int: {type(res)=} {res}') - - return res - - def get_bool(self, key: str, *, default: bool = None) -> bool: - """ - Return the bool referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_bool`. - """ - res = self.get_int(key, default=default) # type: ignore - if res is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - return bool(res) - - def set(self, key: str, val: Union[int, str, List[str], bool]) -> None: - """ - Set the given key's data to the given value. - - Implements :meth:`AbstractConfig.set`. - """ - reg_type = None - if isinstance(val, str): - reg_type = winreg.REG_SZ - winreg.SetValueEx(self.__reg_handle, key, REG_RESERVED_ALWAYS_ZERO, winreg.REG_SZ, val) - - elif isinstance(val, int): # The original code checked for numbers.Integral, I dont think that is needed. - reg_type = winreg.REG_DWORD - - elif isinstance(val, list): - reg_type = winreg.REG_MULTI_SZ - - elif isinstance(val, bool): - reg_type = winreg.REG_DWORD - val = int(val) - - else: - raise ValueError(f'Unexpected type for value {type(val)=}') - - # Its complaining about the list, it works, tested on windows, ignored. - winreg.SetValueEx(self.__reg_handle, key, REG_RESERVED_ALWAYS_ZERO, reg_type, val) # type: ignore - - def delete(self, key: str, *, suppress=False) -> None: - """ - Delete the given key from the config. - - 'key' is relative to the base Registry path we use. - - Implements :meth:`AbstractConfig.delete`. - """ - try: - winreg.DeleteValue(self.__reg_handle, key) - except OSError: - if suppress: - return - - raise - - def save(self) -> None: - """ - Save the configuration. - - Not required for WinConfig as Registry keys are flushed on write. - """ - pass - - def close(self): - """ - Close this config and release any associated resources. - - Implements :meth:`AbstractConfig.close`. - """ - self.__reg_handle.Close() - - -class MacConfig(AbstractConfig): - """MacConfig is the implementation of AbstractConfig for Darwin based OSes.""" - - def __init__(self) -> None: - super().__init__() - support_path = pathlib.Path( - NSSearchPathForDirectoriesInDomains( - NSApplicationSupportDirectory, NSUserDomainMask, True - )[0] - ) - - self.app_dir_path = support_path / appname - self.app_dir_path.mkdir(exist_ok=True) - - self.plugin_dir_path = self.app_dir_path / 'plugins' - self.plugin_dir_path.mkdir(exist_ok=True) - - # Bundle IDs identify a singled app though out a system - - if getattr(sys, 'frozen', False): - exe_dir = pathlib.Path(sys.executable).parent - self.internal_plugin_dir_path = exe_dir.parent / 'Library' / 'plugins' - self.respath_path = exe_dir.parent / 'Resources' - self.identifier = NSBundle.mainBundle().bundleIdentifier() - - else: - file_dir = pathlib.Path(__file__).parent - self.internal_plugin_dir_path = file_dir / 'plugins' - self.respath_path = file_dir - - self.identifier = f'uk.org.marginal.{appname.lower()}' - NSBundle.mainBundle().infoDictionary()['CFBundleIdentifier'] = self.identifier - - self.default_journal_dir_path = support_path / 'Frontier Developments' / 'Elite Dangerous' - self._defaults = NSUserDefaults.standardUserDefaults() - self._settings: Dict[str, Union[int, str, list]] = dict( - self._defaults.persistentDomainForName_(self.identifier) or {} - ) # make writeable - - if (out_dir := self.get_str('out_dir')) is None or not pathlib.Path(out_dir).exists(): - self.set('outdir', NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, True)[0]) - - def __raw_get(self, key: str) -> Union[None, list, str, int]: - """ - Retrieve the raw data for the given key. - - :param str: str - The key data is being requested for. - :return: The requested data. - """ - res = self._settings.get(key) - # On MacOS Catalina, with python.org python 3.9.2 any 'list' - # has type __NSCFArray so a simple `isinstance(res, list)` is - # False. So, check it's not-None, and not the other types. - # - # If we can find where to import the definition of NSCFArray - # then we could possibly test against that. - if res is not None and not isinstance(res, str) and not isinstance(res, int): - return list(res) - - return res - - def get_str(self, key: str, *, default: str = None) -> str: - """ - Return the string referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_str`. - """ - res = self.__raw_get(key) - if res is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - if not isinstance(res, str): - raise ValueError(f'unexpected data returned from __raw_get: {type(res)=} {res}') - - return res - - def get_list(self, key: str, *, default: list = None) -> list: - """ - Return the list referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_list`. - """ - res = self.__raw_get(key) - if res is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - elif not isinstance(res, list): - raise ValueError(f'__raw_get returned unexpected type {type(res)=} {res!r}') - - return res - - def get_int(self, key: str, *, default: int = 0) -> int: - """ - Return the int referred to by key if it exists in the config. - - Implements :meth:`AbstractConfig.get_int`. - """ - res = self.__raw_get(key) - if res is None: - return default - - elif not isinstance(res, (str, int)): - raise ValueError(f'__raw_get returned unexpected type {type(res)=} {res!r}') - - try: - return int(res) - - except ValueError as e: - logger.error(f'__raw_get returned {res!r} which cannot be parsed to an int: {e}') - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - def get_bool(self, key: str, *, default: bool = None) -> bool: - """ - Return the bool referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_bool`. - """ - res = self.__raw_get(key) - if res is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - elif not isinstance(res, bool): - raise ValueError(f'__raw_get returned unexpected type {type(res)=} {res!r}') - - return res - - def set(self, key: str, val: Union[int, str, List[str], bool]) -> None: - """ - Set the given key's data to the given value. - - Implements :meth:`AbstractConfig.set`. - """ - if self._settings is None: - raise ValueError('attempt to use a closed _settings') - - if not isinstance(val, (bool, str, int, list)): - raise ValueError(f'Unexpected type for value {type(val)=}') - - self._settings[key] = val - - def delete(self, key: str, *, suppress=False) -> None: - """ - Delete the given key from the config. - - Implements :meth:`AbstractConfig.delete`. - """ - try: - del self._settings[key] - - except Exception: - if suppress: - pass - - def save(self) -> None: - """ - Save the current configuration. - - Implements :meth:`AbstractConfig.save`. - """ - self._defaults.setPersistentDomain_forName_(self._settings, self.identifier) - self._defaults.synchronize() - - def close(self) -> None: - """ - Close this config and release any associated resources. - - Implements :meth:`AbstractConfig.close`. - """ - self.save() - self._defaults = None - - -class LinuxConfig(AbstractConfig): - """Linux implementation of AbstractConfig.""" - - SECTION = 'config' - # TODO: I dislike this, would rather use a sane config file format. But here we are. - __unescape_lut = {'\\': '\\', 'n': '\n', ';': ';', 'r': '\r', '#': '#'} - __escape_lut = {'\\': '\\', '\n': 'n', ';': ';', '\r': 'r'} - - def __init__(self, filename: Optional[str] = None) -> None: - super().__init__() - # http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html - xdg_data_home = pathlib.Path(os.getenv('XDG_DATA_HOME', default='~/.local/share')).expanduser() - self.app_dir_path = xdg_data_home / appname - self.app_dir_path.mkdir(exist_ok=True, parents=True) - - self.plugin_dir_path = self.app_dir_path / 'plugins' - self.plugin_dir_path.mkdir(exist_ok=True) - - self.respath_path = pathlib.Path(__file__).parent - - self.internal_plugin_dir_path = self.respath_path / 'plugins' - self.default_journal_dir_path = None # type: ignore - self.identifier = f'uk.org.marginal.{appname.lower()}' # TODO: Unused? - - config_home = pathlib.Path(os.getenv('XDG_CONFIG_HOME', default='~/.config')).expanduser() - - self.filename = config_home / appname / f'{appname}.ini' - if filename is not None: - self.filename = pathlib.Path(filename) - - self.filename.parent.mkdir(exist_ok=True, parents=True) - - self.config: Optional[ConfigParser] = ConfigParser(comment_prefixes=('#',), interpolation=None) - self.config.read(self.filename) # read() ignores files that dont exist - - # Ensure that our section exists. This is here because configparser will happily create files for us, but it - # does not magically create sections - try: - self.config[self.SECTION].get("this_does_not_exist", fallback=None) - except KeyError: - logger.info("Config section not found. Backing up existing file (if any) and readding a section header") - if self.filename.exists(): - (self.filename.parent / f'{appname}.ini.backup').write_bytes(self.filename.read_bytes()) - - self.config.add_section(self.SECTION) - - if (outdir := self.get_str('outdir')) is None or not pathlib.Path(outdir).is_dir(): - self.set('outdir', self.home) - - def __escape(self, s: str) -> str: - """ - Escape a string using self.__escape_lut. - - This does NOT support multi-character escapes. - - :param s: str - String to be escaped. - :return: str - The escaped string. - """ - out = "" - for c in s: - if c not in self.__escape_lut: - out += c - continue - - out += '\\' + self.__escape_lut[c] - - return out - - def __unescape(self, s: str) -> str: - """ - Unescape a string. - - :param s: str - The string to unescape. - :return: str - The unescaped string. - """ - out: List[str] = [] - i = 0 - while i < len(s): - c = s[i] - if c != '\\': - out.append(c) - i += 1 - continue - - # We have a backslash, check what its escaping - if i == len(s)-1: - raise ValueError('Escaped string has unescaped trailer') - - unescaped = self.__unescape_lut.get(s[i+1]) - if unescaped is None: - raise ValueError(f'Unknown escape: \\ {s[i+1]}') - - out.append(unescaped) - i += 2 - - return "".join(out) - - def __raw_get(self, key: str) -> Optional[str]: - """ - Get a raw data value from the config file. - - :param key: str - The key data is being requested for. - :return: str - The raw data, if found. - """ - if self.config is None: - raise ValueError('Attempt to use a closed config') - - return self.config[self.SECTION].get(key) - - def get_str(self, key: str, *, default: str = None) -> str: - """ - Return the string referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_str`. - """ - data = self.__raw_get(key) - if data is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - if '\n' in data: - raise ValueError('asked for string, got list') - - return self.__unescape(data) - - def get_list(self, key: str, *, default: list = None) -> list: - """ - Return the list referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_list`. - """ - data = self.__raw_get(key) - - if data is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - split = data.split('\n') - if split[-1] != ';': - raise ValueError('Encoded list does not have trailer sentinel') - - return list(map(self.__unescape, split[:-1])) - - def get_int(self, key: str, *, default: int = 0) -> int: - """ - Return the int referred to by key if it exists in the config. - - Implements :meth:`AbstractConfig.get_int`. - """ - data = self.__raw_get(key) - - if data is None: - return default - - try: - return int(data) - - except ValueError as e: - raise ValueError(f'requested {key=} as int cannot be converted to int') from e - - def get_bool(self, key: str, *, default: bool = None) -> bool: - """ - Return the bool referred to by the given key if it exists, or the default. - - Implements :meth:`AbstractConfig.get_bool`. - """ - if self.config is None: - raise ValueError('attempt to use a closed config') - - data = self.__raw_get(key) - if data is None: - return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default - - return bool(int(data)) - - def set(self, key: str, val: Union[int, str, List[str]]) -> None: - """ - Set the given key's data to the given value. - - Implements :meth:`AbstractConfig.set`. - """ - if self.config is None: - raise ValueError('attempt to use a closed config') - - to_set: Optional[str] = None - if isinstance(val, bool): - to_set = str(int(val)) - - elif isinstance(val, str): - to_set = self.__escape(val) - - elif isinstance(val, int): - to_set = str(val) - - elif isinstance(val, list): - to_set = '\n'.join([self.__escape(s) for s in val] + [';']) - - else: - raise ValueError(f'Unexpected type for value {type(val)=}') - - self.config.set(self.SECTION, key, to_set) - self.save() - - def delete(self, key: str, *, suppress=False) -> None: - """ - Delete the given key from the config. - - Implements :meth:`AbstractConfig.delete`. - """ - if self.config is None: - raise ValueError('attempt to use a closed config') - - self.config.remove_option(self.SECTION, key) - self.save() - - def save(self) -> None: - """ - Save the current configuration. - - Implements :meth:`AbstractConfig.save`. - """ - if self.config is None: - raise ValueError('attempt to use a closed config') - - with open(self.filename, 'w', encoding='utf-8') as f: - self.config.write(f) - - def close(self) -> None: - """ - Close this config and release any associated resources. - - Implements :meth:`AbstractConfig.close`. - """ - self.save() - self.config = None - - -def get_config(*args, **kwargs) -> AbstractConfig: - """ - Get the appropriate config class for the current platform. - - :param args: Args to be passed through to implementation. - :param kwargs: Args to be passed through to implementation. - :return: Instance of the implementation. - """ - if sys.platform == "darwin": - return MacConfig(*args, **kwargs) - elif sys.platform == "win32": - return WinConfig(*args, **kwargs) - elif sys.platform == "linux": - return LinuxConfig(*args, **kwargs) - else: - raise ValueError(f'Unknown platform: {sys.platform=}') - - -config = get_config() diff --git a/config/__init__.py b/config/__init__.py new file mode 100644 index 00000000..eff2859b --- /dev/null +++ b/config/__init__.py @@ -0,0 +1,473 @@ +""" +Code dealing with the configuration of the program. + +Windows uses the Registry to store values in a flat manner. +Linux uses a file, but for commonality it's still a flat data structure. +macOS uses a 'defaults' object. +""" + + +__all__ = [ + # defined in the order they appear in the file + 'GITVERSION_FILE', + 'appname', + 'applongname', + 'appcmdname', + 'copyright', + 'update_feed', + 'update_interval', + 'debug_senders', + 'trace_on', + 'capi_pretend_down', + 'capi_debug_access_token', + 'logger', + 'git_shorthash_from_head', + 'appversion', + 'user_agent', + 'appversion_nobuild', + 'AbstractConfig', + 'config' +] + +import abc +import contextlib +import logging +import os +import pathlib +import re +import subprocess +import sys +import traceback +import warnings +from abc import abstractmethod +from typing import Any, Callable, List, Optional, Type, TypeVar, Union + +import semantic_version + +from constants import GITVERSION_FILE, applongname, appname + +# Any of these may be imported by plugins +appcmdname = 'EDMC' +# appversion **MUST** follow Semantic Versioning rules: +# +# Major.Minor.Patch(-prerelease)(+buildmetadata) +# NB: Do *not* import this, use the functions appversion() and appversion_nobuild() +_static_appversion = '5.3.0-beta4' +_cached_version: Optional[semantic_version.Version] = None +copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' + +update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml' +update_interval = 8*60*60 +# Providers marked to be in debug mode. Generally this is expected to switch to sending data to a log file +debug_senders: List[str] = [] +# TRACE logging code that should actually be used. Means not spamming it +# *all* if only interested in some things. +trace_on: List[str] = [] + +capi_pretend_down: bool = False +capi_debug_access_token: Optional[str] = None +# This must be done here in order to avoid an import cycle with EDMCLogging. +# Other code should use EDMCLogging.get_main_logger +if os.getenv("EDMC_NO_UI"): + logger = logging.getLogger(appcmdname) + +else: + logger = logging.getLogger(appname) + + +_T = TypeVar('_T') + + +########################################################################### +def git_shorthash_from_head() -> str: + """ + Determine short hash for current git HEAD. + + Includes `.DIRTY` if any changes have been made from HEAD + + :return: str - None if we couldn't determine the short hash. + """ + shorthash: str = None # type: ignore + + try: + git_cmd = subprocess.Popen('git rev-parse --short HEAD'.split(), + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + out, err = git_cmd.communicate() + + except Exception as e: + logger.info(f"Couldn't run git command for short hash: {e!r}") + + else: + shorthash = out.decode().rstrip('\n') + if re.match(r'^[0-9a-f]{7,}$', shorthash) is None: + logger.error(f"'{shorthash}' doesn't look like a valid git short hash, forcing to None") + shorthash = None # type: ignore + + if shorthash is not None: + with contextlib.suppress(Exception): + result = subprocess.run('git diff --stat HEAD'.split(), capture_output=True) + if len(result.stdout) > 0: + shorthash += '.DIRTY' + + if len(result.stderr) > 0: + logger.warning(f'Data from git on stderr:\n{str(result.stderr)}') + + return shorthash + + +def appversion() -> semantic_version.Version: + """ + Determine app version including git short hash if possible. + + :return: The augmented app version. + """ + global _cached_version + if _cached_version is not None: + return _cached_version + + if getattr(sys, 'frozen', False): + # Running frozen, so we should have a .gitversion file + # Yes, .parent because if frozen we're inside library.zip + with open(pathlib.Path(sys.path[0]).parent / GITVERSION_FILE, 'r', encoding='utf-8') as gitv: + shorthash = gitv.read() + + else: + # Running from source + shorthash = git_shorthash_from_head() + if shorthash is None: + shorthash = 'UNKNOWN' + + _cached_version = semantic_version.Version(f'{_static_appversion}+{shorthash}') + return _cached_version + + +user_agent = f'EDCD-{appname}-{appversion()}' + + +def appversion_nobuild() -> semantic_version.Version: + """ + Determine app version without *any* build meta data. + + This will not only strip any added git short hash, but also any trailing + '+' in _static_appversion. + + :return: App version without any build meta data. + """ + return appversion().truncate('prerelease') +########################################################################### + + +class AbstractConfig(abc.ABC): + """Abstract root class of all platform specific Config implementations.""" + + OUT_MKT_EDDN = 1 + # OUT_MKT_BPC = 2 # No longer supported + OUT_MKT_TD = 4 + OUT_MKT_CSV = 8 + OUT_SHIP = 16 + # OUT_SHIP_EDS = 16 # Replaced by OUT_SHIP + # OUT_SYS_FILE = 32 # No longer supported + # OUT_STAT = 64 # No longer available + # OUT_SHIP_CORIOLIS = 128 # Replaced by OUT_SHIP + OUT_STATION_ANY = OUT_MKT_EDDN | OUT_MKT_TD | OUT_MKT_CSV + # OUT_SYS_EDSM = 256 # Now a plugin + # OUT_SYS_AUTO = 512 # Now always automatic + OUT_MKT_MANUAL = 1024 + OUT_SYS_EDDN = 2048 + OUT_SYS_DELAY = 4096 + + app_dir_path: pathlib.Path + plugin_dir_path: pathlib.Path + internal_plugin_dir_path: pathlib.Path + respath_path: pathlib.Path + home_path: pathlib.Path + default_journal_dir_path: pathlib.Path + + identifier: str + + __in_shutdown = False # Is the application currently shutting down ? + __auth_force_localserver = False # Should we use localhost for auth callback ? + __auth_force_edmc_protocol = False # Should we force edmc:// protocol ? + __eddn_url = None # Non-default EDDN URL + __eddn_tracking_ui = False # Show EDDN tracking UI ? + + def __init__(self) -> None: + self.home_path = pathlib.Path.home() + + def set_shutdown(self): + """Set flag denoting we're in the shutdown sequence.""" + self.__in_shutdown = True + + @property + def shutting_down(self) -> bool: + """ + Determine if we're in the shutdown sequence. + + :return: bool - True if in shutdown sequence. + """ + return self.__in_shutdown + + def set_auth_force_localserver(self): + """Set flag to force use of localhost web server for Frontier Auth callback.""" + self.__auth_force_localserver = True + + @property + def auth_force_localserver(self) -> bool: + """ + Determine if use of localhost is forced for Frontier Auth callback. + + :return: bool - True if we should use localhost web server. + """ + return self.__auth_force_localserver + + def set_auth_force_edmc_protocol(self): + """Set flag to force use of localhost web server for Frontier Auth callback.""" + self.__auth_force_edmc_protocol = True + + @property + def auth_force_edmc_protocol(self) -> bool: + """ + Determine if use of localhost is forced for Frontier Auth callback. + + :return: bool - True if we should use localhost web server. + """ + return self.__auth_force_edmc_protocol + + def set_eddn_url(self, eddn_url: str): + """Set the specified eddn URL.""" + self.__eddn_url = eddn_url + + @property + def eddn_url(self) -> Optional[str]: + """ + Provide the custom EDDN URL. + + :return: str - Custom EDDN URL to use. + """ + return self.__eddn_url + + def set_eddn_tracking_ui(self): + """Activate EDDN tracking UI.""" + self.__eddn_tracking_ui = True + + @property + def eddn_tracking_ui(self) -> bool: + """ + Determine if the EDDN tracking UI be shown. + + :return: bool - Should tracking UI be active? + """ + return self.__eddn_tracking_ui + + @property + def app_dir(self) -> str: + """Return a string version of app_dir.""" + return str(self.app_dir_path) + + @property + def plugin_dir(self) -> str: + """Return a string version of plugin_dir.""" + return str(self.plugin_dir_path) + + @property + def internal_plugin_dir(self) -> str: + """Return a string version of internal_plugin_dir.""" + return str(self.internal_plugin_dir_path) + + @property + def respath(self) -> str: + """Return a string version of respath.""" + return str(self.respath_path) + + @property + def home(self) -> str: + """Return a string version of home.""" + return str(self.home_path) + + @property + def default_journal_dir(self) -> str: + """Return a string version of default_journal_dir.""" + return str(self.default_journal_dir_path) + + @staticmethod + def _suppress_call( + func: Callable[..., _T], exceptions: Union[Type[BaseException], List[Type[BaseException]]] = Exception, + *args: Any, **kwargs: Any + ) -> Optional[_T]: + if exceptions is None: + exceptions = [Exception] + + if not isinstance(exceptions, list): + exceptions = [exceptions] + + with contextlib.suppress(*exceptions): # type: ignore # it works fine, mypy + return func(*args, **kwargs) + + return None + + def get(self, key: str, default: Union[list, str, bool, int] = None) -> Union[list, str, bool, int]: + """ + Return the data for the requested key, or a default. + + :param key: The key data is being requested for. + :param default: The default to return if the key does not exist, defaults to None. + :raises OSError: On Windows, if a Registry error occurs. + :return: The data or the default. + """ + warnings.warn(DeprecationWarning('get is Deprecated. use the specific getter for your type')) + logger.debug('Attempt to use Deprecated get() method\n' + ''.join(traceback.format_stack())) + + if (l := self._suppress_call(self.get_list, ValueError, key, default=None)) is not None: + return l + + elif (s := self._suppress_call(self.get_str, ValueError, key, default=None)) is not None: + return s + + elif (b := self._suppress_call(self.get_bool, ValueError, key, default=None)) is not None: + return b + + elif (i := self._suppress_call(self.get_int, ValueError, key, default=None)) is not None: + return i + + return default # type: ignore + + @abstractmethod + def get_list(self, key: str, *, default: list = None) -> list: + """ + Return the list referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_list`. + """ + raise NotImplementedError + + @abstractmethod + def get_str(self, key: str, *, default: str = None) -> str: + """ + Return the string referred to by the given key if it exists, or the default. + + :param key: The key data is being requested for. + :param default: Default to return if the key does not exist, defaults to None. + :raises ValueError: If an internal error occurs getting or converting a value. + :raises OSError: On Windows, if a Registry error occurs. + :return: The requested data or the default. + """ + raise NotImplementedError + + @abstractmethod + def get_bool(self, key: str, *, default: bool = None) -> bool: + """ + Return the bool referred to by the given key if it exists, or the default. + + :param key: The key data is being requested for. + :param default: Default to return if the key does not exist, defaults to None + :raises ValueError: If an internal error occurs getting or converting a value + :raises OSError: On Windows, if a Registry error occurs. + :return: The requested data or the default + """ + raise NotImplementedError + + def getint(self, key: str, *, default: int = 0) -> int: + """ + Getint is a Deprecated getter method. + + See get_int for its replacement. + :raises OSError: On Windows, if a Registry error occurs. + """ + warnings.warn(DeprecationWarning('getint is Deprecated. Use get_int instead')) + logger.debug('Attempt to use Deprecated getint() method\n' + ''.join(traceback.format_stack())) + + return self.get_int(key, default=default) + + @abstractmethod + def get_int(self, key: str, *, default: int = 0) -> int: + """ + Return the int referred to by key if it exists in the config. + + For legacy reasons, the default is 0 and not None. + + :param key: The key data is being requested for. + :param default: Default to return if the key does not exist, defaults to 0. + :raises ValueError: If the internal representation of this key cannot be converted to an int. + :raises OSError: On Windows, if a Registry error occurs. + :return: The requested data or the default. + """ + raise NotImplementedError + + @abstractmethod + def set(self, key: str, val: Union[int, str, List[str], bool]) -> None: + """ + Set the given key's data to the given value. + + :param key: The key to set the value on. + :param val: The value to set the key's data to. + :raises ValueError: On an invalid type. + :raises OSError: On Windows, if a Registry error occurs. + """ + raise NotImplementedError + + @abstractmethod + def delete(self, key: str, *, suppress=False) -> None: + """ + Delete the given key from the config. + + :param key: The key to delete. + :param suppress: bool - Whether to suppress any errors. Useful in case + code to migrate settings is blindly removing an old key. + :raises OSError: On Windows, if a registry error occurs. + """ + raise NotImplementedError + + @abstractmethod + def save(self) -> None: + """ + Save the current configuration. + + :raises OSError: On Windows, if a Registry error occurs. + """ + raise NotImplementedError + + @abstractmethod + def close(self) -> None: + """Close this config and release any associated resources.""" + raise NotImplementedError + + def get_password(self, account: str) -> None: + """Legacy password retrieval.""" + warnings.warn("password subsystem is no longer supported", DeprecationWarning) + + def set_password(self, account: str, password: str) -> None: + """Legacy password setting.""" + warnings.warn("password subsystem is no longer supported", DeprecationWarning) + + def delete_password(self, account: str) -> None: + """Legacy password deletion.""" + warnings.warn("password subsystem is no longer supported", DeprecationWarning) + + +def get_config(*args, **kwargs) -> AbstractConfig: + """ + Get the appropriate config class for the current platform. + + :param args: Args to be passed through to implementation. + :param kwargs: Args to be passed through to implementation. + :return: Instance of the implementation. + """ + if sys.platform == "darwin": + from .darwin import MacConfig + return MacConfig(*args, **kwargs) + + elif sys.platform == "win32": + from .windows import WinConfig + return WinConfig(*args, **kwargs) + + elif sys.platform == "linux": + from .linux import LinuxConfig + return LinuxConfig(*args, **kwargs) + + else: + raise ValueError(f'Unknown platform: {sys.platform=}') + + +config = get_config() diff --git a/config/darwin.py b/config/darwin.py new file mode 100644 index 00000000..eb2b887f --- /dev/null +++ b/config/darwin.py @@ -0,0 +1,184 @@ +import pathlib +import sys +from typing import Any, Dict, List, Union + +from Foundation import ( # type: ignore + NSApplicationSupportDirectory, NSBundle, NSDocumentDirectory, NSSearchPathForDirectoriesInDomains, NSUserDefaults, + NSUserDomainMask +) + +from config import AbstractConfig, appname, logger + +assert sys.platform == 'darwin' + + +class MacConfig(AbstractConfig): + """MacConfig is the implementation of AbstractConfig for Darwin based OSes.""" + + def __init__(self) -> None: + super().__init__() + support_path = pathlib.Path( + NSSearchPathForDirectoriesInDomains( + NSApplicationSupportDirectory, NSUserDomainMask, True + )[0] + ) + + self.app_dir_path = support_path / appname + self.app_dir_path.mkdir(exist_ok=True) + + self.plugin_dir_path = self.app_dir_path / 'plugins' + self.plugin_dir_path.mkdir(exist_ok=True) + + # Bundle IDs identify a singled app though out a system + + if getattr(sys, 'frozen', False): + exe_dir = pathlib.Path(sys.executable).parent + self.internal_plugin_dir_path = exe_dir.parent / 'Library' / 'plugins' + self.respath_path = exe_dir.parent / 'Resources' + self.identifier = NSBundle.mainBundle().bundleIdentifier() + + else: + file_dir = pathlib.Path(__file__).parent.parent + self.internal_plugin_dir_path = file_dir / 'plugins' + self.respath_path = file_dir + + self.identifier = f'uk.org.marginal.{appname.lower()}' + NSBundle.mainBundle().infoDictionary()['CFBundleIdentifier'] = self.identifier + + self.default_journal_dir_path = support_path / 'Frontier Developments' / 'Elite Dangerous' + self._defaults: Any = NSUserDefaults.standardUserDefaults() + self._settings: Dict[str, Union[int, str, list]] = dict( + self._defaults.persistentDomainForName_(self.identifier) or {} + ) # make writeable + + if (out_dir := self.get_str('out_dir')) is None or not pathlib.Path(out_dir).exists(): + self.set('outdir', NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, True)[0]) + + def __raw_get(self, key: str) -> Union[None, list, str, int]: + """ + Retrieve the raw data for the given key. + + :param str: str - The key data is being requested for. + :return: The requested data. + """ + res = self._settings.get(key) + # On MacOS Catalina, with python.org python 3.9.2 any 'list' + # has type __NSCFArray so a simple `isinstance(res, list)` is + # False. So, check it's not-None, and not the other types. + # + # If we can find where to import the definition of NSCFArray + # then we could possibly test against that. + if res is not None and not isinstance(res, str) and not isinstance(res, int): + return list(res) + + return res + + def get_str(self, key: str, *, default: str = None) -> str: + """ + Return the string referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_str`. + """ + res = self.__raw_get(key) + if res is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + if not isinstance(res, str): + raise ValueError(f'unexpected data returned from __raw_get: {type(res)=} {res}') + + return res + + def get_list(self, key: str, *, default: list = None) -> list: + """ + Return the list referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_list`. + """ + res = self.__raw_get(key) + if res is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + elif not isinstance(res, list): + raise ValueError(f'__raw_get returned unexpected type {type(res)=} {res!r}') + + return res + + def get_int(self, key: str, *, default: int = 0) -> int: + """ + Return the int referred to by key if it exists in the config. + + Implements :meth:`AbstractConfig.get_int`. + """ + res = self.__raw_get(key) + if res is None: + return default + + elif not isinstance(res, (str, int)): + raise ValueError(f'__raw_get returned unexpected type {type(res)=} {res!r}') + + try: + return int(res) + + except ValueError as e: + logger.error(f'__raw_get returned {res!r} which cannot be parsed to an int: {e}') + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + def get_bool(self, key: str, *, default: bool = None) -> bool: + """ + Return the bool referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_bool`. + """ + res = self.__raw_get(key) + if res is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + elif not isinstance(res, bool): + raise ValueError(f'__raw_get returned unexpected type {type(res)=} {res!r}') + + return res + + def set(self, key: str, val: Union[int, str, List[str], bool]) -> None: + """ + Set the given key's data to the given value. + + Implements :meth:`AbstractConfig.set`. + """ + if self._settings is None: + raise ValueError('attempt to use a closed _settings') + + if not isinstance(val, (bool, str, int, list)): + raise ValueError(f'Unexpected type for value {type(val)=}') + + self._settings[key] = val + + def delete(self, key: str, *, suppress=False) -> None: + """ + Delete the given key from the config. + + Implements :meth:`AbstractConfig.delete`. + """ + try: + del self._settings[key] + + except Exception: + if suppress: + pass + + def save(self) -> None: + """ + Save the current configuration. + + Implements :meth:`AbstractConfig.save`. + """ + self._defaults.setPersistentDomain_forName_(self._settings, self.identifier) + self._defaults.synchronize() + + def close(self) -> None: + """ + Close this config and release any associated resources. + + Implements :meth:`AbstractConfig.close`. + """ + self.save() + self._defaults = None diff --git a/config/linux.py b/config/linux.py new file mode 100644 index 00000000..04087b32 --- /dev/null +++ b/config/linux.py @@ -0,0 +1,245 @@ +"""Linux config implementation.""" +import os +import pathlib +import sys +from configparser import ConfigParser +from typing import List, Optional, Union + +from config import AbstractConfig, appname, logger + +assert sys.platform == 'linux' + + +class LinuxConfig(AbstractConfig): + """Linux implementation of AbstractConfig.""" + + SECTION = 'config' + # TODO: I dislike this, would rather use a sane config file format. But here we are. + __unescape_lut = {'\\': '\\', 'n': '\n', ';': ';', 'r': '\r', '#': '#'} + __escape_lut = {'\\': '\\', '\n': 'n', ';': ';', '\r': 'r'} + + def __init__(self, filename: Optional[str] = None) -> None: + super().__init__() + # http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html + xdg_data_home = pathlib.Path(os.getenv('XDG_DATA_HOME', default='~/.local/share')).expanduser() + self.app_dir_path = xdg_data_home / appname + self.app_dir_path.mkdir(exist_ok=True, parents=True) + + self.plugin_dir_path = self.app_dir_path / 'plugins' + self.plugin_dir_path.mkdir(exist_ok=True) + + self.respath_path = pathlib.Path(__file__).parent.parent + + self.internal_plugin_dir_path = self.respath_path / 'plugins' + self.default_journal_dir_path = None # type: ignore + self.identifier = f'uk.org.marginal.{appname.lower()}' # TODO: Unused? + + config_home = pathlib.Path(os.getenv('XDG_CONFIG_HOME', default='~/.config')).expanduser() + + self.filename = config_home / appname / f'{appname}.ini' + if filename is not None: + self.filename = pathlib.Path(filename) + + self.filename.parent.mkdir(exist_ok=True, parents=True) + + self.config: Optional[ConfigParser] = ConfigParser(comment_prefixes=('#',), interpolation=None) + self.config.read(self.filename) # read() ignores files that dont exist + + # Ensure that our section exists. This is here because configparser will happily create files for us, but it + # does not magically create sections + try: + self.config[self.SECTION].get("this_does_not_exist", fallback=None) + except KeyError: + logger.info("Config section not found. Backing up existing file (if any) and readding a section header") + if self.filename.exists(): + (self.filename.parent / f'{appname}.ini.backup').write_bytes(self.filename.read_bytes()) + + self.config.add_section(self.SECTION) + + if (outdir := self.get_str('outdir')) is None or not pathlib.Path(outdir).is_dir(): + self.set('outdir', self.home) + + def __escape(self, s: str) -> str: + """ + Escape a string using self.__escape_lut. + + This does NOT support multi-character escapes. + + :param s: str - String to be escaped. + :return: str - The escaped string. + """ + out = "" + for c in s: + if c not in self.__escape_lut: + out += c + continue + + out += '\\' + self.__escape_lut[c] + + return out + + def __unescape(self, s: str) -> str: + """ + Unescape a string. + + :param s: str - The string to unescape. + :return: str - The unescaped string. + """ + out: List[str] = [] + i = 0 + while i < len(s): + c = s[i] + if c != '\\': + out.append(c) + i += 1 + continue + + # We have a backslash, check what its escaping + if i == len(s)-1: + raise ValueError('Escaped string has unescaped trailer') + + unescaped = self.__unescape_lut.get(s[i+1]) + if unescaped is None: + raise ValueError(f'Unknown escape: \\ {s[i+1]}') + + out.append(unescaped) + i += 2 + + return "".join(out) + + def __raw_get(self, key: str) -> Optional[str]: + """ + Get a raw data value from the config file. + + :param key: str - The key data is being requested for. + :return: str - The raw data, if found. + """ + if self.config is None: + raise ValueError('Attempt to use a closed config') + + return self.config[self.SECTION].get(key) + + def get_str(self, key: str, *, default: str = None) -> str: + """ + Return the string referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_str`. + """ + data = self.__raw_get(key) + if data is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + if '\n' in data: + raise ValueError('asked for string, got list') + + return self.__unescape(data) + + def get_list(self, key: str, *, default: list = None) -> list: + """ + Return the list referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_list`. + """ + data = self.__raw_get(key) + + if data is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + split = data.split('\n') + if split[-1] != ';': + raise ValueError('Encoded list does not have trailer sentinel') + + return list(map(self.__unescape, split[:-1])) + + def get_int(self, key: str, *, default: int = 0) -> int: + """ + Return the int referred to by key if it exists in the config. + + Implements :meth:`AbstractConfig.get_int`. + """ + data = self.__raw_get(key) + + if data is None: + return default + + try: + return int(data) + + except ValueError as e: + raise ValueError(f'requested {key=} as int cannot be converted to int') from e + + def get_bool(self, key: str, *, default: bool = None) -> bool: + """ + Return the bool referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_bool`. + """ + if self.config is None: + raise ValueError('attempt to use a closed config') + + data = self.__raw_get(key) + if data is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + return bool(int(data)) + + def set(self, key: str, val: Union[int, str, List[str]]) -> None: + """ + Set the given key's data to the given value. + + Implements :meth:`AbstractConfig.set`. + """ + if self.config is None: + raise ValueError('attempt to use a closed config') + + to_set: Optional[str] = None + if isinstance(val, bool): + to_set = str(int(val)) + + elif isinstance(val, str): + to_set = self.__escape(val) + + elif isinstance(val, int): + to_set = str(val) + + elif isinstance(val, list): + to_set = '\n'.join([self.__escape(s) for s in val] + [';']) + + else: + raise ValueError(f'Unexpected type for value {type(val)=}') + + self.config.set(self.SECTION, key, to_set) + self.save() + + def delete(self, key: str, *, suppress=False) -> None: + """ + Delete the given key from the config. + + Implements :meth:`AbstractConfig.delete`. + """ + if self.config is None: + raise ValueError('attempt to use a closed config') + + self.config.remove_option(self.SECTION, key) + self.save() + + def save(self) -> None: + """ + Save the current configuration. + + Implements :meth:`AbstractConfig.save`. + """ + if self.config is None: + raise ValueError('attempt to use a closed config') + + with open(self.filename, 'w', encoding='utf-8') as f: + self.config.write(f) + + def close(self) -> None: + """ + Close this config and release any associated resources. + + Implements :meth:`AbstractConfig.close`. + """ + self.save() + self.config = None diff --git a/config/windows.py b/config/windows.py new file mode 100644 index 00000000..d29a2b42 --- /dev/null +++ b/config/windows.py @@ -0,0 +1,259 @@ +"""Windows config implementation.""" + +# spell-checker: words folderid deps hkey edcd +import ctypes +import functools +import pathlib +import sys +import uuid +import winreg +from ctypes.wintypes import DWORD, HANDLE +from typing import List, Optional, Union + +from config import AbstractConfig, applongname, appname, logger, update_interval + +assert sys.platform == 'win32' + +REG_RESERVED_ALWAYS_ZERO = 0 + +# This is the only way to do this from python without external deps (which do this anyway). +FOLDERID_Documents = uuid.UUID('{FDD39AD0-238F-46AF-ADB4-6C85480369C7}') +FOLDERID_LocalAppData = uuid.UUID('{F1B32785-6FBA-4FCF-9D55-7B8E7F157091}') +FOLDERID_Profile = uuid.UUID('{5E6C858F-0E22-4760-9AFE-EA3317B67173}') +FOLDERID_SavedGames = uuid.UUID('{4C5C32FF-BB9D-43b0-B5B4-2D72E54EAAA4}') + +SHGetKnownFolderPath = ctypes.windll.shell32.SHGetKnownFolderPath +SHGetKnownFolderPath.argtypes = [ctypes.c_char_p, DWORD, HANDLE, ctypes.POINTER(ctypes.c_wchar_p)] + +CoTaskMemFree = ctypes.windll.ole32.CoTaskMemFree +CoTaskMemFree.argtypes = [ctypes.c_void_p] + + +def known_folder_path(guid: uuid.UUID) -> Optional[str]: + """Look up a Windows GUID to actual folder path name.""" + buf = ctypes.c_wchar_p() + if SHGetKnownFolderPath(ctypes.create_string_buffer(guid.bytes_le), 0, 0, ctypes.byref(buf)): + return None + retval = buf.value # copy data + CoTaskMemFree(buf) # and free original + return retval + + +class WinConfig(AbstractConfig): + """Implementation of AbstractConfig for Windows.""" + + def __init__(self, do_winsparkle=True) -> None: + self.app_dir_path = pathlib.Path(str(known_folder_path(FOLDERID_LocalAppData))) / appname + self.app_dir_path.mkdir(exist_ok=True) + + self.plugin_dir_path = self.app_dir_path / 'plugins' + self.plugin_dir_path.mkdir(exist_ok=True) + + if getattr(sys, 'frozen', False): + self.respath_path = pathlib.Path(sys.executable).parent + self.internal_plugin_dir_path = self.respath_path / 'plugins' + + else: + self.respath_path = pathlib.Path(__file__).parent.parent + self.internal_plugin_dir_path = self.respath_path / 'plugins' + + self.home_path = pathlib.Path.home() + + journal_dir_str = known_folder_path(FOLDERID_SavedGames) + journaldir = pathlib.Path(journal_dir_str) if journal_dir_str is not None else None + self.default_journal_dir_path = None # type: ignore + if journaldir is not None: + self.default_journal_dir_path = journaldir / 'Frontier Developments' / 'Elite Dangerous' + + create_key_defaults = functools.partial( + winreg.CreateKeyEx, + key=winreg.HKEY_CURRENT_USER, + access=winreg.KEY_ALL_ACCESS | winreg.KEY_WOW64_64KEY, + ) + + try: + self.__reg_handle: winreg.HKEYType = create_key_defaults( + sub_key=r'Software\Marginal\EDMarketConnector' + ) + if do_winsparkle: + self.__setup_winsparkle() + + except OSError: + logger.exception('could not create required registry keys') + raise + + self.identifier = applongname + if (outdir_str := self.get_str('outdir')) is None or not pathlib.Path(outdir_str).is_dir(): + docs = known_folder_path(FOLDERID_Documents) + self.set('outdir', docs if docs is not None else self.home) + + def __setup_winsparkle(self): + """Ensure the necessary Registry keys for WinSparkle are present.""" + create_key_defaults = functools.partial( + winreg.CreateKeyEx, + key=winreg.HKEY_CURRENT_USER, + access=winreg.KEY_ALL_ACCESS | winreg.KEY_WOW64_64KEY, + ) + try: + edcd_handle: winreg.HKEYType = create_key_defaults(sub_key=r'Software\EDCD\EDMarketConnector') + winsparkle_reg: winreg.HKEYType = winreg.CreateKeyEx( + edcd_handle, sub_key='WinSparkle', access=winreg.KEY_ALL_ACCESS | winreg.KEY_WOW64_64KEY + ) + + except OSError: + logger.exception('could not open WinSparkle handle') + raise + + # set WinSparkle defaults - https://github.com/vslavik/winsparkle/wiki/Registry-Settings + winreg.SetValueEx( + winsparkle_reg, 'UpdateInterval', REG_RESERVED_ALWAYS_ZERO, winreg.REG_SZ, str(update_interval) + ) + + try: + winreg.QueryValueEx(winsparkle_reg, 'CheckForUpdates') + + except FileNotFoundError: + # Key doesn't exist, set it to a default + winreg.SetValueEx(winsparkle_reg, 'CheckForUpdates', REG_RESERVED_ALWAYS_ZERO, winreg.REG_SZ, '1') + + winsparkle_reg.Close() + edcd_handle.Close() + + def __get_regentry(self, key: str) -> Union[None, list, str, int]: + """Access the Registry for the raw entry.""" + try: + value, _type = winreg.QueryValueEx(self.__reg_handle, key) + except FileNotFoundError: + # Key doesn't exist + return None + + # The type returned is actually as we'd expect for each of these. The casts are here for type checkers and + # For programmers who want to actually know what is going on + if _type == winreg.REG_SZ: + return str(value) + + elif _type == winreg.REG_DWORD: + return int(value) + + elif _type == winreg.REG_MULTI_SZ: + return list(value) + + else: + logger.warning(f'registry key {key=} returned unknown type {_type=} {value=}') + return None + + def get_str(self, key: str, *, default: str = None) -> str: + """ + Return the string referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_str`. + """ + res = self.__get_regentry(key) + if res is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + elif not isinstance(res, str): + raise ValueError(f'Data from registry is not a string: {type(res)=} {res=}') + + return res + + def get_list(self, key: str, *, default: list = None) -> list: + """ + Return the list referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_list`. + """ + res = self.__get_regentry(key) + if res is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + elif not isinstance(res, list): + raise ValueError(f'Data from registry is not a list: {type(res)=} {res}') + + return res + + def get_int(self, key: str, *, default: int = 0) -> int: + """ + Return the int referred to by key if it exists in the config. + + Implements :meth:`AbstractConfig.get_int`. + """ + res = self.__get_regentry(key) + if res is None: + return default + + if not isinstance(res, int): + raise ValueError(f'Data from registry is not an int: {type(res)=} {res}') + + return res + + def get_bool(self, key: str, *, default: bool = None) -> bool: + """ + Return the bool referred to by the given key if it exists, or the default. + + Implements :meth:`AbstractConfig.get_bool`. + """ + res = self.get_int(key, default=default) # type: ignore + if res is None: + return default # type: ignore # Yes it could be None, but we're _assuming_ that people gave us a default + + return bool(res) + + def set(self, key: str, val: Union[int, str, List[str], bool]) -> None: + """ + Set the given key's data to the given value. + + Implements :meth:`AbstractConfig.set`. + """ + reg_type = None + if isinstance(val, str): + reg_type = winreg.REG_SZ + winreg.SetValueEx(self.__reg_handle, key, REG_RESERVED_ALWAYS_ZERO, winreg.REG_SZ, val) + + elif isinstance(val, int): # The original code checked for numbers.Integral, I dont think that is needed. + reg_type = winreg.REG_DWORD + + elif isinstance(val, list): + reg_type = winreg.REG_MULTI_SZ + + elif isinstance(val, bool): + reg_type = winreg.REG_DWORD + val = int(val) + + else: + raise ValueError(f'Unexpected type for value {type(val)=}') + + # Its complaining about the list, it works, tested on windows, ignored. + winreg.SetValueEx(self.__reg_handle, key, REG_RESERVED_ALWAYS_ZERO, reg_type, val) # type: ignore + + def delete(self, key: str, *, suppress=False) -> None: + """ + Delete the given key from the config. + + 'key' is relative to the base Registry path we use. + + Implements :meth:`AbstractConfig.delete`. + """ + try: + winreg.DeleteValue(self.__reg_handle, key) + except OSError: + if suppress: + return + + raise + + def save(self) -> None: + """ + Save the configuration. + + Not required for WinConfig as Registry keys are flushed on write. + """ + pass + + def close(self): + """ + Close this config and release any associated resources. + + Implements :meth:`AbstractConfig.close`. + """ + self.__reg_handle.Close() From bff6175ee79c2687c07e5578a3ba3747ff7096b0 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 13:54:04 +0200 Subject: [PATCH 309/527] Update to use sys.platform over platform --- EDMarketConnector.py | 52 +++++---- dashboard.py | 15 ++- journal_lock.py | 10 +- l10n.py | 21 ++-- myNotebook.py | 82 +++++++------ prefs.py | 48 ++++---- stats.py | 16 ++- tests/config.py/_old_config.py | 13 +-- theme.py | 206 +++++++++++++++++---------------- ttkHyperlinkLabel.py | 57 ++++----- 10 files changed, 267 insertions(+), 253 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 01c9d846..6aa27ca3 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- """Entry point for the main GUI application.""" +from __future__ import annotations import argparse import html @@ -14,7 +15,6 @@ import webbrowser from builtins import object, str from os import chdir, environ from os.path import dirname, join -from sys import platform from time import localtime, strftime, time from typing import TYPE_CHECKING, Optional, Tuple, Union @@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Optional, Tuple, Union # place for things like config.py reading .gitversion if getattr(sys, 'frozen', False): # Under py2exe sys.path[0] is the executable name - if platform == 'win32': + if sys.platform == 'win32': chdir(dirname(sys.path[0])) # Allow executable to be invoked from any cwd environ['TCL_LIBRARY'] = join(dirname(sys.path[0]), 'lib', 'tcl') @@ -234,7 +234,7 @@ if __name__ == '__main__': # noqa: C901 """Handle any edmc:// auth callback, else foreground existing window.""" logger.trace_if('frontier-auth.windows', 'Begin...') - if platform == 'win32': + if sys.platform == 'win32': # If *this* instance hasn't locked, then another already has and we # now need to do the edmc:// checks for auth callback @@ -370,8 +370,9 @@ if __name__ == '__main__': # noqa: C901 # isort: off if TYPE_CHECKING: from logging import TRACE # type: ignore # noqa: F401 # Needed to update mypy - import update - from infi.systray import SysTrayIcon + + if sys.platform == 'win32': + from infi.systray import SysTrayIcon # isort: on def _(x: str) -> str: @@ -443,7 +444,7 @@ class AppWindow(object): self.prefsdialog = None - if platform == 'win32': + if sys.platform == 'win32': from infi.systray import SysTrayIcon def open_window(systray: 'SysTrayIcon') -> None: @@ -456,8 +457,8 @@ class AppWindow(object): plug.load_plugins(master) - if platform != 'darwin': - if platform == 'win32': + if sys.platform != 'darwin': + if sys.platform == 'win32': self.w.wm_iconbitmap(default='EDMarketConnector.ico') else: @@ -527,7 +528,7 @@ class AppWindow(object): # LANG: Update button in main window self.button = ttk.Button(frame, text=_('Update'), width=28, default=tk.ACTIVE, state=tk.DISABLED) - self.theme_button = tk.Label(frame, width=32 if platform == 'darwin' else 28, state=tk.DISABLED) + self.theme_button = tk.Label(frame, width=32 if sys.platform == 'darwin' else 28, state=tk.DISABLED) self.status = tk.Label(frame, name='status', anchor=tk.W) ui_row = frame.grid_size()[1] @@ -540,14 +541,15 @@ class AppWindow(object): theme.button_bind(self.theme_button, self.capi_request_data) for child in frame.winfo_children(): - child.grid_configure(padx=self.PADX, pady=(platform != 'win32' or isinstance(child, tk.Frame)) and 2 or 0) + child.grid_configure(padx=self.PADX, pady=( + sys.platform != 'win32' or isinstance(child, tk.Frame)) and 2 or 0) # The type needs defining for adding the menu entry, but won't be # properly set until later self.updater: update.Updater = None self.menubar = tk.Menu() - if platform == 'darwin': + if sys.platform == 'darwin': # Can't handle (de)iconify if topmost is set, so suppress iconify button # http://wiki.tcl.tk/13428 and p15 of # https://developer.apple.com/legacy/library/documentation/Carbon/Conceptual/HandlingWindowsControls/windowscontrols.pdf @@ -603,7 +605,7 @@ class AppWindow(object): self.help_menu.add_command(command=lambda: not self.HelpAbout.showing and self.HelpAbout(self.w)) self.menubar.add_cascade(menu=self.help_menu) - if platform == 'win32': + if sys.platform == 'win32': # Must be added after at least one "real" menu entry self.always_ontop = tk.BooleanVar(value=bool(config.get_int('always_ontop'))) self.system_menu = tk.Menu(self.menubar, name='system', tearoff=tk.FALSE) @@ -674,11 +676,11 @@ class AppWindow(object): if config.get_str('geometry'): match = re.match(r'\+([\-\d]+)\+([\-\d]+)', config.get_str('geometry')) if match: - if platform == 'darwin': + if sys.platform == 'darwin': # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7 if int(match.group(2)) >= 0: self.w.geometry(config.get_str('geometry')) - elif platform == 'win32': + elif sys.platform == 'win32': # Check that the titlebar will be at least partly on screen import ctypes from ctypes.wintypes import POINT @@ -776,7 +778,7 @@ class AppWindow(object): self.suit_shown = True if not self.suit_shown: - if platform != 'win32': + if sys.platform != 'win32': pady = 2 else: @@ -826,7 +828,7 @@ class AppWindow(object): self.system_label['text'] = _('System') + ':' # LANG: Label for 'System' line in main UI self.station_label['text'] = _('Station') + ':' # LANG: Label for 'Station' line in main UI self.button['text'] = self.theme_button['text'] = _('Update') # LANG: Update button in main window - if platform == 'darwin': + if sys.platform == 'darwin': self.menubar.entryconfigure(1, label=_('File')) # LANG: 'File' menu title on OSX self.menubar.entryconfigure(2, label=_('Edit')) # LANG: 'Edit' menu title on OSX self.menubar.entryconfigure(3, label=_('View')) # LANG: 'View' menu title on OSX @@ -873,7 +875,7 @@ class AppWindow(object): self.button['state'] = self.theme_button['state'] = tk.DISABLED - if platform == 'darwin': + if sys.platform == 'darwin': self.view_menu.entryconfigure(0, state=tk.DISABLED) # Status self.file_menu.entryconfigure(0, state=tk.DISABLED) # Save Raw Data @@ -887,7 +889,7 @@ class AppWindow(object): # LANG: Successfully authenticated with the Frontier website self.status['text'] = _('Authentication successful') - if platform == 'darwin': + if sys.platform == 'darwin': self.view_menu.entryconfigure(0, state=tk.NORMAL) # Status self.file_menu.entryconfigure(0, state=tk.NORMAL) # Save Raw Data @@ -1211,7 +1213,7 @@ class AppWindow(object): companion.session.invalidate() self.login() - except companion.ServerConnectionError as e: + except companion.ServerConnectionError as e: # TODO: unreachable (subclass of ServerLagging -- move to above) logger.warning(f'Exception while contacting server: {e}') err = self.status['text'] = str(e) play_bad = True @@ -1429,7 +1431,7 @@ class AppWindow(object): companion.session.auth_callback() # LANG: Successfully authenticated with the Frontier website self.status['text'] = _('Authentication successful') - if platform == 'darwin': + if sys.platform == 'darwin': self.view_menu.entryconfigure(0, state=tk.NORMAL) # Status self.file_menu.entryconfigure(0, state=tk.NORMAL) # Save Raw Data @@ -1570,11 +1572,11 @@ class AppWindow(object): # position over parent # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7 - if platform != 'darwin' or parent.winfo_rooty() > 0: + if sys.platform != 'darwin' or parent.winfo_rooty() > 0: self.geometry(f'+{parent.winfo_rootx():d}+{parent.winfo_rooty():d}') # remove decoration - if platform == 'win32': + if sys.platform == 'win32': self.attributes('-toolwindow', tk.TRUE) self.resizable(tk.FALSE, tk.FALSE) @@ -1651,7 +1653,7 @@ class AppWindow(object): """ default_extension: str = '' - if platform == 'darwin': + if sys.platform == 'darwin': default_extension = '.json' timestamp: str = strftime('%Y-%m-%dT%H.%M.%S', localtime()) @@ -1676,7 +1678,7 @@ class AppWindow(object): def onexit(self, event=None) -> None: """Application shutdown procedure.""" - if platform == 'win32': + if sys.platform == 'win32': shutdown_thread = threading.Thread(target=self.systray.shutdown) shutdown_thread.setDaemon(True) shutdown_thread.start() @@ -1684,7 +1686,7 @@ class AppWindow(object): config.set_shutdown() # Signal we're in shutdown now. # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7 - if platform != 'darwin' or self.w.winfo_rooty() > 0: + if sys.platform != 'darwin' or self.w.winfo_rooty() > 0: x, y = self.w.geometry().split('+')[1:3] # e.g. '212x170+2881+1267' config.set('geometry', f'+{x}+{y}') diff --git a/dashboard.py b/dashboard.py index 43e7e52b..c371e2b7 100644 --- a/dashboard.py +++ b/dashboard.py @@ -2,11 +2,11 @@ import json import pathlib +import sys import time import tkinter as tk from calendar import timegm from os.path import getsize, isdir, isfile -from sys import platform from typing import Any, Dict from config import config @@ -14,11 +14,11 @@ from EDMCLogging import get_main_logger logger = get_main_logger() -if platform == 'darwin': +if sys.platform == 'darwin': from watchdog.events import FileSystemEventHandler from watchdog.observers import Observer -elif platform == 'win32': +elif sys.platform == 'win32': from watchdog.events import FileSystemEventHandler from watchdog.observers import Observer @@ -71,26 +71,25 @@ class Dashboard(FileSystemEventHandler): # File system events are unreliable/non-existent over network drives on Linux. # We can't easily tell whether a path points to a network drive, so assume # any non-standard logdir might be on a network drive and poll instead. - polling = platform != 'win32' - if not polling and not self.observer: + if not (sys.platform != 'win32') and not self.observer: logger.debug('Setting up observer...') self.observer = Observer() self.observer.daemon = True self.observer.start() logger.debug('Done') - elif polling and self.observer: + elif (sys.platform != 'win32') and self.observer: logger.debug('Using polling, stopping observer...') self.observer.stop() self.observer = None # type: ignore logger.debug('Done') - if not self.observed and not polling: + if not self.observed and not (sys.platform != 'win32'): logger.debug('Starting observer...') self.observed = self.observer.schedule(self, self.currentdir) logger.debug('Done') - logger.info(f'{polling and "Polling" or "Monitoring"} Dashboard "{self.currentdir}"') + logger.info(f'{(sys.platform != "win32") and "Polling" or "Monitoring"} Dashboard "{self.currentdir}"') # Even if we're not intending to poll, poll at least once to process pre-existing # data and to check whether the watchdog thread has crashed due to events not diff --git a/journal_lock.py b/journal_lock.py index 6b2e9951..1c984f90 100644 --- a/journal_lock.py +++ b/journal_lock.py @@ -1,10 +1,10 @@ """Implements locking of Journal directory.""" import pathlib +import sys import tkinter as tk from enum import Enum from os import getpid as os_getpid -from sys import platform from tkinter import ttk from typing import TYPE_CHECKING, Callable, Optional @@ -94,7 +94,7 @@ class JournalLock: :return: LockResult - See the class Enum definition """ - if platform == 'win32': + if sys.platform == 'win32': logger.trace_if('journal-lock', 'win32, using msvcrt') # win32 doesn't have fcntl, so we have to use msvcrt import msvcrt @@ -143,7 +143,7 @@ class JournalLock: return True # We weren't locked, and still aren't unlocked = False - if platform == 'win32': + if sys.platform == 'win32': logger.trace_if('journal-lock', 'win32, using msvcrt') # win32 doesn't have fcntl, so we have to use msvcrt import msvcrt @@ -206,10 +206,10 @@ class JournalLock: self.title(_('Journal directory already locked')) # remove decoration - if platform == 'win32': + if sys.platform == 'win32': self.attributes('-toolwindow', tk.TRUE) - elif platform == 'darwin': + elif sys.platform == 'darwin': # http://wiki.tcl.tk/13428 parent.call('tk::unsupported::MacWindowStyle', 'style', self, 'utility') diff --git a/l10n.py b/l10n.py index b77c07de..9db28022 100755 --- a/l10n.py +++ b/l10n.py @@ -12,7 +12,6 @@ import warnings from collections import OrderedDict from contextlib import suppress from os.path import basename, dirname, isdir, isfile, join -from sys import platform from typing import TYPE_CHECKING, Dict, Iterable, Optional, Set, TextIO, Union, cast if TYPE_CHECKING: @@ -37,12 +36,12 @@ LANGUAGE_ID = '!Language' LOCALISATION_DIR = 'L10n' -if platform == 'darwin': +if sys.platform == 'darwin': from Foundation import ( # type: ignore # exists on Darwin NSLocale, NSNumberFormatter, NSNumberFormatterDecimalStyle ) -elif platform == 'win32': +elif sys.platform == 'win32': import ctypes from ctypes.wintypes import BOOL, DWORD, LPCVOID, LPCWSTR, LPWSTR if TYPE_CHECKING: @@ -176,7 +175,7 @@ class _Translations: def available(self) -> Set[str]: """Return a list of available language codes.""" path = self.respath() - if getattr(sys, 'frozen', False) and platform == 'darwin': + if getattr(sys, 'frozen', False) and sys.platform == 'darwin': available = { x[:-len('.lproj')] for x in os.listdir(path) if x.endswith('.lproj') and isfile(join(x, 'Localizable.strings')) @@ -204,7 +203,7 @@ class _Translations: def respath(self) -> pathlib.Path: """Path to localisation files.""" if getattr(sys, 'frozen', False): - if platform == 'darwin': + if sys.platform == 'darwin': return (pathlib.Path(sys.executable).parents[0] / os.pardir / 'Resources').resolve() return pathlib.Path(dirname(sys.executable)) / LOCALISATION_DIR @@ -233,7 +232,7 @@ class _Translations: except OSError: logger.exception(f'could not open {f}') - elif getattr(sys, 'frozen', False) and platform == 'darwin': + elif getattr(sys, 'frozen', False) and sys.platform == 'darwin': return (self.respath() / f'{lang}.lproj' / 'Localizable.strings').open('r', encoding='utf-16') return (self.respath() / f'{lang}.strings').open('r', encoding='utf-8') @@ -243,7 +242,7 @@ class _Locale: """Locale holds a few utility methods to convert data to and from localized versions.""" def __init__(self) -> None: - if platform == 'darwin': + if sys.platform == 'darwin': self.int_formatter = NSNumberFormatter.alloc().init() self.int_formatter.setNumberStyle_(NSNumberFormatterDecimalStyle) self.float_formatter = NSNumberFormatter.alloc().init() @@ -276,7 +275,7 @@ class _Locale: if decimals == 0 and not isinstance(number, numbers.Integral): number = int(round(number)) - if platform == 'darwin': + if sys.platform == 'darwin': if not decimals and isinstance(number, numbers.Integral): return self.int_formatter.stringFromNumber_(number) @@ -298,7 +297,7 @@ class _Locale: :param string: The string to convert :return: None if the string cannot be parsed, otherwise an int or float dependant on input data. """ - if platform == 'darwin': + if sys.platform == 'darwin': return self.float_formatter.numberFromString_(string) with suppress(ValueError): @@ -321,10 +320,10 @@ class _Locale: :return: The preferred language list """ languages: Iterable[str] - if platform == 'darwin': + if sys.platform == 'darwin': languages = NSLocale.preferredLanguages() - elif platform != 'win32': + elif sys.platform != 'win32': # POSIX lang = locale.getlocale()[0] languages = lang and [lang.replace('_', '-')] or [] diff --git a/myNotebook.py b/myNotebook.py index 19f2aaa6..85566a21 100644 --- a/myNotebook.py +++ b/myNotebook.py @@ -4,22 +4,21 @@ # - OSX: page background should be a darker gray than systemWindowBody # selected tab foreground should be White when the window is active # - -from sys import platform - +import sys import tkinter as tk from tkinter import ttk # Entire file may be imported by plugins # Can't do this with styles on OSX - http://www.tkdocs.com/tutorial/styles.html#whydifficult -if platform == 'darwin': +if sys.platform == 'darwin': from platform import mac_ver PAGEFG = 'systemButtonText' PAGEBG = 'systemButtonActiveDarkShadow' -elif platform == 'win32': + +elif sys.platform == 'win32': PAGEFG = 'SystemWindowText' - PAGEBG = 'SystemWindow' # typically white + PAGEBG = 'SystemWindow' # typically white class Notebook(ttk.Notebook): @@ -29,14 +28,14 @@ class Notebook(ttk.Notebook): ttk.Notebook.__init__(self, master, **kw) style = ttk.Style() - if platform=='darwin': - if list(map(int, mac_ver()[0].split('.'))) >= [10,10]: + if sys.platform == 'darwin': + if list(map(int, mac_ver()[0].split('.'))) >= [10, 10]: # Hack for tab appearance with 8.5 on Yosemite & El Capitan. For proper fix see # https://github.com/tcltk/tk/commit/55c4dfca9353bbd69bbcec5d63bf1c8dfb461e25 - style.configure('TNotebook.Tab', padding=(12,10,12,2)) + style.configure('TNotebook.Tab', padding=(12, 10, 12, 2)) style.map('TNotebook.Tab', foreground=[('selected', '!background', 'systemWhite')]) - self.grid(sticky=tk.NSEW) # Already padded apropriately - elif platform == 'win32': + self.grid(sticky=tk.NSEW) # Already padded apropriately + elif sys.platform == 'win32': style.configure('nb.TFrame', background=PAGEBG) style.configure('nb.TButton', background=PAGEBG) style.configure('nb.TCheckbutton', foreground=PAGEFG, background=PAGEBG) @@ -47,56 +46,60 @@ class Notebook(ttk.Notebook): self.grid(padx=10, pady=10, sticky=tk.NSEW) -class Frame(platform == 'darwin' and tk.Frame or ttk.Frame): +class Frame(sys.platform == 'darwin' and tk.Frame or ttk.Frame): def __init__(self, master=None, **kw): - if platform == 'darwin': + if sys.platform == 'darwin': kw['background'] = kw.pop('background', PAGEBG) tk.Frame.__init__(self, master, **kw) tk.Frame(self).grid(pady=5) - elif platform == 'win32': + elif sys.platform == 'win32': ttk.Frame.__init__(self, master, style='nb.TFrame', **kw) - ttk.Frame(self).grid(pady=5) # top spacer + ttk.Frame(self).grid(pady=5) # top spacer else: ttk.Frame.__init__(self, master, **kw) - ttk.Frame(self).grid(pady=5) # top spacer - self.configure(takefocus = 1) # let the frame take focus so that no particular child is focused + ttk.Frame(self).grid(pady=5) # top spacer + self.configure(takefocus=1) # let the frame take focus so that no particular child is focused + class Label(tk.Label): def __init__(self, master=None, **kw): - if platform in ['darwin', 'win32']: + if sys.platform in ['darwin', 'win32']: kw['foreground'] = kw.pop('foreground', PAGEFG) kw['background'] = kw.pop('background', PAGEBG) else: kw['foreground'] = kw.pop('foreground', ttk.Style().lookup('TLabel', 'foreground')) kw['background'] = kw.pop('background', ttk.Style().lookup('TLabel', 'background')) - tk.Label.__init__(self, master, **kw) # Just use tk.Label on all platforms + tk.Label.__init__(self, master, **kw) # Just use tk.Label on all platforms -class Entry(platform == 'darwin' and tk.Entry or ttk.Entry): + +class Entry(sys.platform == 'darwin' and tk.Entry or ttk.Entry): def __init__(self, master=None, **kw): - if platform == 'darwin': + if sys.platform == 'darwin': kw['highlightbackground'] = kw.pop('highlightbackground', PAGEBG) tk.Entry.__init__(self, master, **kw) else: ttk.Entry.__init__(self, master, **kw) -class Button(platform == 'darwin' and tk.Button or ttk.Button): + +class Button(sys.platform == 'darwin' and tk.Button or ttk.Button): def __init__(self, master=None, **kw): - if platform == 'darwin': + if sys.platform == 'darwin': kw['highlightbackground'] = kw.pop('highlightbackground', PAGEBG) tk.Button.__init__(self, master, **kw) - elif platform == 'win32': + elif sys.platform == 'win32': ttk.Button.__init__(self, master, style='nb.TButton', **kw) else: ttk.Button.__init__(self, master, **kw) -class ColoredButton(platform == 'darwin' and tk.Label or tk.Button): + +class ColoredButton(sys.platform == 'darwin' and tk.Label or tk.Button): def __init__(self, master=None, **kw): - if platform == 'darwin': + if sys.platform == 'darwin': # Can't set Button background on OSX, so use a Label instead kw['relief'] = kw.pop('relief', tk.RAISED) self._command = kw.pop('command', None) @@ -105,52 +108,55 @@ class ColoredButton(platform == 'darwin' and tk.Label or tk.Button): else: tk.Button.__init__(self, master, **kw) - if platform == 'darwin': + if sys.platform == 'darwin': def _press(self, event): self._command() -class Checkbutton(platform == 'darwin' and tk.Checkbutton or ttk.Checkbutton): + +class Checkbutton(sys.platform == 'darwin' and tk.Checkbutton or ttk.Checkbutton): def __init__(self, master=None, **kw): - if platform == 'darwin': + if sys.platform == 'darwin': kw['foreground'] = kw.pop('foreground', PAGEFG) kw['background'] = kw.pop('background', PAGEBG) tk.Checkbutton.__init__(self, master, **kw) - elif platform == 'win32': + elif sys.platform == 'win32': ttk.Checkbutton.__init__(self, master, style='nb.TCheckbutton', **kw) else: ttk.Checkbutton.__init__(self, master, **kw) -class Radiobutton(platform == 'darwin' and tk.Radiobutton or ttk.Radiobutton): + +class Radiobutton(sys.platform == 'darwin' and tk.Radiobutton or ttk.Radiobutton): def __init__(self, master=None, **kw): - if platform == 'darwin': + if sys.platform == 'darwin': kw['foreground'] = kw.pop('foreground', PAGEFG) kw['background'] = kw.pop('background', PAGEBG) tk.Radiobutton.__init__(self, master, **kw) - elif platform == 'win32': + elif sys.platform == 'win32': ttk.Radiobutton.__init__(self, master, style='nb.TRadiobutton', **kw) else: ttk.Radiobutton.__init__(self, master, **kw) -class OptionMenu(platform == 'darwin' and tk.OptionMenu or ttk.OptionMenu): + +class OptionMenu(sys.platform == 'darwin' and tk.OptionMenu or ttk.OptionMenu): def __init__(self, master, variable, default=None, *values, **kw): - if platform == 'darwin': + if sys.platform == 'darwin': variable.set(default) bg = kw.pop('background', PAGEBG) tk.OptionMenu.__init__(self, master, variable, *values, **kw) self['background'] = bg - elif platform == 'win32': + elif sys.platform == 'win32': # OptionMenu derives from Menubutton at the Python level, so uses Menubutton's style ttk.OptionMenu.__init__(self, master, variable, default, *values, style='nb.TMenubutton', **kw) - self['menu'].configure(background = PAGEBG) + self['menu'].configure(background=PAGEBG) # Workaround for https://bugs.python.org/issue25684 for i in range(0, self['menu'].index('end')+1): self['menu'].entryconfig(i, variable=variable) else: ttk.OptionMenu.__init__(self, master, variable, default, *values, **kw) - self['menu'].configure(background = ttk.Style().lookup('TMenu', 'background')) + self['menu'].configure(background=ttk.Style().lookup('TMenu', 'background')) # Workaround for https://bugs.python.org/issue25684 for i in range(0, self['menu'].index('end')+1): self['menu'].entryconfig(i, variable=variable) diff --git a/prefs.py b/prefs.py index d6728ab4..03b8dcd8 100644 --- a/prefs.py +++ b/prefs.py @@ -3,10 +3,10 @@ import contextlib import logging +import sys import tkinter as tk import webbrowser from os.path import expanduser, expandvars, join, normpath -from sys import platform from tkinter import colorchooser as tkColorChooser # type: ignore # noqa: N812 from tkinter import ttk from types import TracebackType @@ -154,7 +154,7 @@ class AutoInc(contextlib.AbstractContextManager): return None -if platform == 'darwin': +if sys.platform == 'darwin': import objc # type: ignore from Foundation import NSFileManager # type: ignore try: @@ -179,7 +179,7 @@ if platform == 'darwin': was_accessible_at_launch = AXIsProcessTrusted() # type: ignore -elif platform == 'win32': +elif sys.platform == 'win32': import ctypes import winreg from ctypes.wintypes import HINSTANCE, HWND, LPARAM, LPCWSTR, LPVOID, LPWSTR, MAX_PATH, POINT, RECT, SIZE, UINT @@ -246,7 +246,7 @@ class PreferencesDialog(tk.Toplevel): self.parent = parent self.callback = callback - if platform == 'darwin': + if sys.platform == 'darwin': # LANG: File > Preferences menu entry for macOS self.title(_('Preferences')) @@ -258,15 +258,15 @@ class PreferencesDialog(tk.Toplevel): self.transient(parent) # position over parent - if platform != 'darwin' or parent.winfo_rooty() > 0: # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7 + if sys.platform != 'darwin' or parent.winfo_rooty() > 0: # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7 # TODO this is fixed supposedly. self.geometry(f'+{parent.winfo_rootx()}+{parent.winfo_rooty()}') # remove decoration - if platform == 'win32': + if sys.platform == 'win32': self.attributes('-toolwindow', tk.TRUE) - elif platform == 'darwin': + elif sys.platform == 'darwin': # http://wiki.tcl.tk/13428 parent.call('tk::unsupported::MacWindowStyle', 'style', self, 'utility') @@ -294,7 +294,7 @@ class PreferencesDialog(tk.Toplevel): self.__setup_appearance_tab(notebook) self.__setup_plugin_tab(notebook) - if platform == 'darwin': + if sys.platform == 'darwin': self.protocol("WM_DELETE_WINDOW", self.apply) # close button applies changes else: @@ -322,7 +322,7 @@ class PreferencesDialog(tk.Toplevel): self.grab_set() # Ensure fully on-screen - if platform == 'win32' and CalculatePopupWindowPosition: + if sys.platform == 'win32' and CalculatePopupWindowPosition: position = RECT() GetWindowRect(GetParent(self.winfo_id()), position) if CalculatePopupWindowPosition( @@ -396,7 +396,7 @@ class PreferencesDialog(tk.Toplevel): self.outdir_entry = nb.Entry(output_frame, takefocus=False) self.outdir_entry.grid(columnspan=2, padx=self.PADX, pady=(0, self.PADY), sticky=tk.EW, row=row.get()) - if platform == 'darwin': + if sys.platform == 'darwin': text = (_('Change...')) # LANG: macOS Preferences - files location selection button else: @@ -446,7 +446,7 @@ class PreferencesDialog(tk.Toplevel): self.logdir_entry.grid(columnspan=4, padx=self.PADX, pady=(0, self.PADY), sticky=tk.EW, row=row.get()) - if platform == 'darwin': + if sys.platform == 'darwin': text = (_('Change...')) # LANG: macOS Preferences - files location selection button else: @@ -470,7 +470,7 @@ class PreferencesDialog(tk.Toplevel): state=tk.NORMAL if config.get_str('journaldir') else tk.DISABLED ).grid(column=2, pady=self.PADY, sticky=tk.EW, row=row.get()) - if platform in ('darwin', 'win32'): + if sys.platform in ('darwin', 'win32'): ttk.Separator(config_frame, orient=tk.HORIZONTAL).grid( columnspan=4, padx=self.PADX, pady=self.PADY*4, sticky=tk.EW, row=row.get() ) @@ -482,11 +482,11 @@ class PreferencesDialog(tk.Toplevel): nb.Label( config_frame, text=_('Keyboard shortcut') if # LANG: Hotkey/Shortcut settings prompt on OSX - platform == 'darwin' else + sys.platform == 'darwin' else _('Hotkey') # LANG: Hotkey/Shortcut settings prompt on Windows ).grid(padx=self.PADX, sticky=tk.W, row=row.get()) - if platform == 'darwin' and not was_accessible_at_launch: + if sys.platform == 'darwin' and not was_accessible_at_launch: if AXIsProcessTrusted(): # Shortcut settings prompt on OSX nb.Label( @@ -511,7 +511,8 @@ class PreferencesDialog(tk.Toplevel): ) else: - self.hotkey_text = nb.Entry(config_frame, width=(20 if platform == 'darwin' else 30), justify=tk.CENTER) + self.hotkey_text = nb.Entry(config_frame, width=( + 20 if sys.platform == 'darwin' else 30), justify=tk.CENTER) self.hotkey_text.insert( 0, # No hotkey/shortcut currently defined @@ -741,7 +742,7 @@ class PreferencesDialog(tk.Toplevel): appearance_frame, text=_('Dark'), variable=self.theme, value=1, command=self.themevarchanged ).grid(columnspan=3, padx=self.BUTTONX, sticky=tk.W, row=row.get()) - if platform == 'win32': + if sys.platform == 'win32': nb.Radiobutton( appearance_frame, # LANG: Label for 'Transparent' theme radio button @@ -870,7 +871,7 @@ class PreferencesDialog(tk.Toplevel): ) self.ontop_button.grid(columnspan=3, padx=self.BUTTONX, sticky=tk.W, row=row.get()) # Appearance setting - if platform == 'win32': + if sys.platform == 'win32': nb.Checkbutton( appearance_frame, # LANG: Appearance option for Windows "minimize to system tray" @@ -997,7 +998,7 @@ class PreferencesDialog(tk.Toplevel): def tabchanged(self, event: tk.Event) -> None: """Handle preferences active tab changing.""" self.outvarchanged() - if platform == 'darwin': + if sys.platform == 'darwin': # Hack to recompute size so that buttons show up under Mojave notebook = event.widget frame = self.nametowidget(notebook.winfo_parent()) @@ -1027,9 +1028,8 @@ class PreferencesDialog(tk.Toplevel): # If encoding isn't UTF-8 we can't use the tkinter dialog current_locale = locale.getlocale(locale.LC_CTYPE) - from sys import platform as sys_platform directory = None - if sys_platform == 'win32' and current_locale[1] not in ('utf8', 'UTF8', 'utf-8', 'UTF-8'): + if sys.platform == 'win32' and current_locale[1] not in ('utf8', 'UTF8', 'utf-8', 'UTF-8'): def browsecallback(hwnd, uMsg, lParam, lpData): # noqa: N803 # Windows API convention # set initial folder if uMsg == BFFM_INITIALIZED and lpData: @@ -1075,7 +1075,7 @@ class PreferencesDialog(tk.Toplevel): # TODO: This is awful. entryfield['state'] = tk.NORMAL # must be writable to update entryfield.delete(0, tk.END) - if platform == 'win32': + if sys.platform == 'win32': start = len(config.home.split('\\')) if pathvar.get().lower().startswith(config.home.lower()) else 0 display = [] components = normpath(pathvar.get()).split('\\') @@ -1096,7 +1096,7 @@ class PreferencesDialog(tk.Toplevel): entryfield.insert(0, '\\'.join(display)) # None if path doesn't exist - elif platform == 'darwin' and NSFileManager.defaultManager().componentsToDisplayForPath_(pathvar.get()): + elif sys.platform == 'darwin' and NSFileManager.defaultManager().componentsToDisplayForPath_(pathvar.get()): if pathvar.get().startswith(config.home): display = ['~'] + NSFileManager.defaultManager().componentsToDisplayForPath_(pathvar.get())[ len(NSFileManager.defaultManager().componentsToDisplayForPath_(config.home)): @@ -1236,7 +1236,7 @@ class PreferencesDialog(tk.Toplevel): else: config.set('journaldir', logdir) - if platform in ('darwin', 'win32'): + if sys.platform in ('darwin', 'win32'): config.set('hotkey_code', self.hotkey_code) config.set('hotkey_mods', self.hotkey_mods) config.set('hotkey_always', int(not self.hotkey_only.get())) @@ -1282,7 +1282,7 @@ class PreferencesDialog(tk.Toplevel): self.parent.wm_attributes('-topmost', 1 if config.get_int('always_ontop') else 0) self.destroy() - if platform == 'darwin': + if sys.platform == 'darwin': def enableshortcuts(self) -> None: """Set up macOS preferences shortcut.""" self.apply() diff --git a/stats.py b/stats.py index ef993a53..6886eb23 100644 --- a/stats.py +++ b/stats.py @@ -1,9 +1,9 @@ """CMDR Status information.""" import csv import json +import sys import tkinter import tkinter as tk -from sys import platform from tkinter import ttk from typing import TYPE_CHECKING, Any, AnyStr, Callable, Dict, List, NamedTuple, Optional, Sequence, cast @@ -20,11 +20,9 @@ logger = EDMCLogging.get_main_logger() if TYPE_CHECKING: def _(x: str) -> str: ... -if platform == 'win32': +if sys.platform == 'win32': import ctypes from ctypes.wintypes import HWND, POINT, RECT, SIZE, UINT - if TYPE_CHECKING: - import ctypes.windll # type: ignore # Fake this into existing, its really a magic dll thing try: CalculatePopupWindowPosition = ctypes.windll.user32.CalculatePopupWindowPosition @@ -372,15 +370,15 @@ class StatsResults(tk.Toplevel): self.transient(parent) # position over parent - if platform != 'darwin' or parent.winfo_rooty() > 0: # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7 + if sys.platform != 'darwin' or parent.winfo_rooty() > 0: # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7 self.geometry(f"+{parent.winfo_rootx()}+{parent.winfo_rooty()}") # remove decoration self.resizable(tk.FALSE, tk.FALSE) - if platform == 'win32': + if sys.platform == 'win32': self.attributes('-toolwindow', tk.TRUE) - elif platform == 'darwin': + elif sys.platform == 'darwin': # http://wiki.tcl.tk/13428 parent.call('tk::unsupported::MacWindowStyle', 'style', self, 'utility') @@ -421,7 +419,7 @@ class StatsResults(tk.Toplevel): ttk.Frame(page).grid(pady=5) # bottom spacer notebook.add(page, text=_('Ships')) # LANG: Status dialog title - if platform != 'darwin': + if sys.platform != 'darwin': buttonframe = ttk.Frame(frame) buttonframe.grid(padx=10, pady=(0, 10), sticky=tk.NSEW) # type: ignore # the tuple is supported buttonframe.columnconfigure(0, weight=1) @@ -433,7 +431,7 @@ class StatsResults(tk.Toplevel): self.grab_set() # Ensure fully on-screen - if platform == 'win32' and CalculatePopupWindowPosition: + if sys.platform == 'win32' and CalculatePopupWindowPosition: position = RECT() GetWindowRect(GetParent(self.winfo_id()), position) if CalculatePopupWindowPosition( diff --git a/tests/config.py/_old_config.py b/tests/config.py/_old_config.py index b1609975..5983e050 100644 --- a/tests/config.py/_old_config.py +++ b/tests/config.py/_old_config.py @@ -4,7 +4,6 @@ import warnings from configparser import NoOptionError from os import getenv, makedirs, mkdir, pardir from os.path import dirname, expanduser, isdir, join, normpath -from sys import platform from typing import TYPE_CHECKING, Optional, Union from config import applongname, appname, update_interval @@ -12,13 +11,13 @@ from EDMCLogging import get_main_logger logger = get_main_logger() -if platform == 'darwin': +if sys.platform == 'darwin': from Foundation import ( # type: ignore NSApplicationSupportDirectory, NSBundle, NSDocumentDirectory, NSSearchPathForDirectoriesInDomains, NSUserDefaults, NSUserDomainMask ) -elif platform == 'win32': +elif sys.platform == 'win32': import ctypes import uuid from ctypes.wintypes import DWORD, HANDLE, HKEY, LONG, LPCVOID, LPCWSTR @@ -90,7 +89,7 @@ elif platform == 'win32': CoTaskMemFree(buf) # and free original return retval -elif platform == 'linux': +elif sys.platform == 'linux': import codecs from configparser import RawConfigParser @@ -114,7 +113,7 @@ class OldConfig(): OUT_SYS_EDDN = 2048 OUT_SYS_DELAY = 4096 - if platform == 'darwin': # noqa: C901 # It's gating *all* the functions + if sys.platform == 'darwin': # noqa: C901 # It's gating *all* the functions def __init__(self): self.app_dir = join( @@ -199,7 +198,7 @@ class OldConfig(): self.save() self.defaults = None - elif platform == 'win32': + elif sys.platform == 'win32': def __init__(self): self.app_dir = join(known_folder_path(FOLDERID_LocalAppData), appname) # type: ignore # Not going to change @@ -362,7 +361,7 @@ class OldConfig(): RegCloseKey(self.hkey) self.hkey = None - elif platform == 'linux': + elif sys.platform == 'linux': SECTION = 'config' def __init__(self): diff --git a/theme.py b/theme.py index cac65ba7..8515bfbb 100644 --- a/theme.py +++ b/theme.py @@ -6,9 +6,9 @@ # import os +import sys import tkinter as tk from os.path import join -from sys import platform from tkinter import font as tkFont from tkinter import ttk @@ -18,20 +18,20 @@ from ttkHyperlinkLabel import HyperlinkLabel if __debug__: from traceback import print_exc -if platform == "linux": +if sys.platform == "linux": from ctypes import POINTER, Structure, byref, c_char_p, c_int, c_long, c_uint, c_ulong, c_void_p, cdll -if platform == 'win32': +if sys.platform == 'win32': import ctypes from ctypes.wintypes import DWORD, LPCVOID, LPCWSTR AddFontResourceEx = ctypes.windll.gdi32.AddFontResourceExW AddFontResourceEx.restypes = [LPCWSTR, DWORD, LPCVOID] - FR_PRIVATE = 0x10 + FR_PRIVATE = 0x10 FR_NOT_ENUM = 0x20 AddFontResourceEx(join(config.respath, u'EUROCAPS.TTF'), FR_PRIVATE, 0) -elif platform == 'linux': +elif sys.platform == 'linux': # pyright: reportUnboundVariable=false XID = c_ulong # from X.h: typedef unsigned long XID Window = XID @@ -40,7 +40,7 @@ elif platform == 'linux': PropModeReplace = 0 PropModePrepend = 1 - PropModeAppend = 2 + PropModeAppend = 2 # From xprops.h MWM_HINTS_FUNCTIONS = 1 << 0 @@ -69,16 +69,17 @@ elif platform == 'linux': ('input_mode', c_long), ('status', c_ulong), ] - + # workaround for https://github.com/EDCD/EDMarketConnector/issues/568 - if not os.getenv("EDMC_NO_UI") : + if not os.getenv("EDMC_NO_UI"): try: xlib = cdll.LoadLibrary('libX11.so.6') XInternAtom = xlib.XInternAtom XInternAtom.argtypes = [POINTER(Display), c_char_p, c_int] XInternAtom.restype = Atom XChangeProperty = xlib.XChangeProperty - XChangeProperty.argtypes = [POINTER(Display), Window, Atom, Atom, c_int, c_int, POINTER(MotifWmHints), c_int] + XChangeProperty.argtypes = [POINTER(Display), Window, Atom, Atom, c_int, + c_int, POINTER(MotifWmHints), c_int] XChangeProperty.restype = c_int XFlush = xlib.XFlush XFlush.argtypes = [POINTER(Display)] @@ -87,29 +88,31 @@ elif platform == 'linux': XOpenDisplay.argtypes = [c_char_p] XOpenDisplay.restype = POINTER(Display) XQueryTree = xlib.XQueryTree - XQueryTree.argtypes = [POINTER(Display), Window, POINTER(Window), POINTER(Window), POINTER(Window), POINTER(c_uint)] + XQueryTree.argtypes = [POINTER(Display), Window, POINTER( + Window), POINTER(Window), POINTER(Window), POINTER(c_uint)] XQueryTree.restype = c_int dpy = xlib.XOpenDisplay(None) if not dpy: raise Exception("Can't find your display, can't continue") - + motif_wm_hints_property = XInternAtom(dpy, b'_MOTIF_WM_HINTS', False) motif_wm_hints_normal = MotifWmHints(MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS, - MWM_FUNC_RESIZE | MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE, - MWM_DECOR_BORDER | MWM_DECOR_RESIZEH | MWM_DECOR_TITLE | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE, - 0, 0) - motif_wm_hints_dark = MotifWmHints(MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS, - MWM_FUNC_RESIZE | MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE, - 0, 0, 0) + MWM_FUNC_RESIZE | MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE, + MWM_DECOR_BORDER | MWM_DECOR_RESIZEH | MWM_DECOR_TITLE | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE, + 0, 0) + motif_wm_hints_dark = MotifWmHints(MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS, + MWM_FUNC_RESIZE | MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE, + 0, 0, 0) except: - if __debug__: print_exc() + if __debug__: + print_exc() dpy = None class _Theme(object): def __init__(self): - self.active = None # Starts out with no theme + self.active = None # Starts out with no theme self.minwidth = None self.widgets = {} self.widgets_pair = [] @@ -124,18 +127,18 @@ class _Theme(object): if not self.defaults: # Can't initialise this til window is created # Windows, MacOS self.defaults = { - 'fg' : tk.Label()['foreground'], # SystemButtonText, systemButtonText - 'bg' : tk.Label()['background'], # SystemButtonFace, White - 'font' : tk.Label()['font'], # TkDefaultFont - 'bitmapfg' : tk.BitmapImage()['foreground'], # '-foreground {} {} #000000 #000000' - 'bitmapbg' : tk.BitmapImage()['background'], # '-background {} {} {} {}' - 'entryfg' : tk.Entry()['foreground'], # SystemWindowText, Black - 'entrybg' : tk.Entry()['background'], # SystemWindow, systemWindowBody - 'entryfont' : tk.Entry()['font'], # TkTextFont - 'frame' : tk.Frame()['background'], # SystemButtonFace, systemWindowBody - 'menufg' : tk.Menu()['foreground'], # SystemMenuText, - 'menubg' : tk.Menu()['background'], # SystemMenu, - 'menufont' : tk.Menu()['font'], # TkTextFont + 'fg': tk.Label()['foreground'], # SystemButtonText, systemButtonText + 'bg': tk.Label()['background'], # SystemButtonFace, White + 'font': tk.Label()['font'], # TkDefaultFont + 'bitmapfg': tk.BitmapImage()['foreground'], # '-foreground {} {} #000000 #000000' + 'bitmapbg': tk.BitmapImage()['background'], # '-background {} {} {} {}' + 'entryfg': tk.Entry()['foreground'], # SystemWindowText, Black + 'entrybg': tk.Entry()['background'], # SystemWindow, systemWindowBody + 'entryfont': tk.Entry()['font'], # TkTextFont + 'frame': tk.Frame()['background'], # SystemButtonFace, systemWindowBody + 'menufg': tk.Menu()['foreground'], # SystemMenuText, + 'menubg': tk.Menu()['background'], # SystemMenu, + 'menufont': tk.Menu()['font'], # TkTextFont } if widget not in self.widgets: @@ -189,26 +192,27 @@ class _Theme(object): def _enter(self, event, image): widget = event.widget if widget and widget['state'] != tk.DISABLED: - widget.configure(state = tk.ACTIVE) + widget.configure(state=tk.ACTIVE) if image: - image.configure(foreground = self.current['activeforeground'], background = self.current['activebackground']) + image.configure(foreground=self.current['activeforeground'], + background=self.current['activebackground']) def _leave(self, event, image): widget = event.widget if widget and widget['state'] != tk.DISABLED: - widget.configure(state = tk.NORMAL) + widget.configure(state=tk.NORMAL) if image: - image.configure(foreground = self.current['foreground'], background = self.current['background']) + image.configure(foreground=self.current['foreground'], background=self.current['background']) # Set up colors def _colors(self, root, theme): style = ttk.Style() - if platform == 'linux': + if sys.platform == 'linux': style.theme_use('clam') # Default dark theme colors if not config.get_str('dark_text'): - config.set('dark_text', '#ff8000') # "Tangerine" in OSX color picker + config.set('dark_text', '#ff8000') # "Tangerine" in OSX color picker if not config.get_str('dark_highlight'): config.set('dark_highlight', 'white') @@ -216,40 +220,40 @@ class _Theme(object): # Dark (r, g, b) = root.winfo_rgb(config.get_str('dark_text')) self.current = { - 'background' : 'grey4', # OSX inactive dark titlebar color - 'foreground' : config.get_str('dark_text'), - 'activebackground' : config.get_str('dark_text'), - 'activeforeground' : 'grey4', - 'disabledforeground' : '#%02x%02x%02x' % (int(r/384), int(g/384), int(b/384)), - 'highlight' : config.get_str('dark_highlight'), + 'background': 'grey4', # OSX inactive dark titlebar color + 'foreground': config.get_str('dark_text'), + 'activebackground': config.get_str('dark_text'), + 'activeforeground': 'grey4', + 'disabledforeground': '#%02x%02x%02x' % (int(r/384), int(g/384), int(b/384)), + 'highlight': config.get_str('dark_highlight'), # Font only supports Latin 1 / Supplement / Extended, and a few General Punctuation and Mathematical Operators # LANG: Label for commander name in main window - 'font' : (theme > 1 and not 0x250 < ord(_('Cmdr')[0]) < 0x3000 and - tkFont.Font(family='Euro Caps', size=10, weight=tkFont.NORMAL) or - 'TkDefaultFont'), + 'font': (theme > 1 and not 0x250 < ord(_('Cmdr')[0]) < 0x3000 and + tkFont.Font(family='Euro Caps', size=10, weight=tkFont.NORMAL) or + 'TkDefaultFont'), } else: # (Mostly) system colors style = ttk.Style() self.current = { - 'background' : (platform == 'darwin' and 'systemMovableModalBackground' or - style.lookup('TLabel', 'background')), - 'foreground' : style.lookup('TLabel', 'foreground'), - 'activebackground' : (platform == 'win32' and 'SystemHighlight' or - style.lookup('TLabel', 'background', ['active'])), - 'activeforeground' : (platform == 'win32' and 'SystemHighlightText' or - style.lookup('TLabel', 'foreground', ['active'])), - 'disabledforeground' : style.lookup('TLabel', 'foreground', ['disabled']), - 'highlight' : 'blue', - 'font' : 'TkDefaultFont', + 'background': (sys.platform == 'darwin' and 'systemMovableModalBackground' or + style.lookup('TLabel', 'background')), + 'foreground': style.lookup('TLabel', 'foreground'), + 'activebackground': (sys.platform == 'win32' and 'SystemHighlight' or + style.lookup('TLabel', 'background', ['active'])), + 'activeforeground': (sys.platform == 'win32' and 'SystemHighlightText' or + style.lookup('TLabel', 'foreground', ['active'])), + 'disabledforeground': style.lookup('TLabel', 'foreground', ['disabled']), + 'highlight': 'blue', + 'font': 'TkDefaultFont', } - # Apply current theme to a widget and its children, and register it for future updates + def update(self, widget): assert isinstance(widget, tk.Widget) or isinstance(widget, tk.BitmapImage), widget if not self.current: - return # No need to call this for widgets created in plugin_app() + return # No need to call this for widgets created in plugin_app() self.register(widget) self._update_widget(widget) if isinstance(widget, tk.Frame) or isinstance(widget, ttk.Frame): @@ -258,56 +262,57 @@ class _Theme(object): # Apply current theme to a single widget def _update_widget(self, widget): - assert widget in self.widgets, '%s %s "%s"' %(widget.winfo_class(), widget, 'text' in widget.keys() and widget['text']) + assert widget in self.widgets, '%s %s "%s"' % ( + widget.winfo_class(), widget, 'text' in widget.keys() and widget['text']) attribs = self.widgets.get(widget, []) if isinstance(widget, tk.BitmapImage): # not a widget if 'fg' not in attribs: - widget.configure(foreground = self.current['foreground']), + widget.configure(foreground=self.current['foreground']), if 'bg' not in attribs: - widget.configure(background = self.current['background']) + widget.configure(background=self.current['background']) elif 'cursor' in widget.keys() and str(widget['cursor']) not in ['', 'arrow']: # Hack - highlight widgets like HyperlinkLabel with a non-default cursor if 'fg' not in attribs: - widget.configure(foreground = self.current['highlight']), - if 'insertbackground' in widget.keys(): # tk.Entry - widget.configure(insertbackground = self.current['foreground']), + widget.configure(foreground=self.current['highlight']), + if 'insertbackground' in widget.keys(): # tk.Entry + widget.configure(insertbackground=self.current['foreground']), if 'bg' not in attribs: - widget.configure(background = self.current['background']) - if 'highlightbackground' in widget.keys(): # tk.Entry - widget.configure(highlightbackground = self.current['background']) + widget.configure(background=self.current['background']) + if 'highlightbackground' in widget.keys(): # tk.Entry + widget.configure(highlightbackground=self.current['background']) if 'font' not in attribs: - widget.configure(font = self.current['font']) + widget.configure(font=self.current['font']) elif 'activeforeground' in widget.keys(): # e.g. tk.Button, tk.Label, tk.Menu if 'fg' not in attribs: - widget.configure(foreground = self.current['foreground'], - activeforeground = self.current['activeforeground'], - disabledforeground = self.current['disabledforeground']) + widget.configure(foreground=self.current['foreground'], + activeforeground=self.current['activeforeground'], + disabledforeground=self.current['disabledforeground']) if 'bg' not in attribs: - widget.configure(background = self.current['background'], - activebackground = self.current['activebackground']) - if platform == 'darwin' and isinstance(widget, tk.Button): - widget.configure(highlightbackground = self.current['background']) + widget.configure(background=self.current['background'], + activebackground=self.current['activebackground']) + if sys.platform == 'darwin' and isinstance(widget, tk.Button): + widget.configure(highlightbackground=self.current['background']) if 'font' not in attribs: - widget.configure(font = self.current['font']) + widget.configure(font=self.current['font']) elif 'foreground' in widget.keys(): # e.g. ttk.Label if 'fg' not in attribs: - widget.configure(foreground = self.current['foreground']), + widget.configure(foreground=self.current['foreground']), if 'bg' not in attribs: - widget.configure(background = self.current['background']) + widget.configure(background=self.current['background']) if 'font' not in attribs: - widget.configure(font = self.current['font']) + widget.configure(font=self.current['font']) elif 'background' in widget.keys() or isinstance(widget, tk.Canvas): # e.g. Frame, Canvas if 'bg' not in attribs: - widget.configure(background = self.current['background'], - highlightbackground = self.current['disabledforeground']) - + widget.configure(background=self.current['background'], + highlightbackground=self.current['disabledforeground']) # Apply configured theme + def apply(self, root): theme = config.get_int('theme') @@ -316,7 +321,7 @@ class _Theme(object): # Apply colors for widget in set(self.widgets): if isinstance(widget, tk.Widget) and not widget.winfo_exists(): - self.widgets.pop(widget) # has been destroyed + self.widgets.pop(widget) # has been destroyed else: self._update_widget(widget) @@ -334,58 +339,61 @@ class _Theme(object): pair[theme].grid(**gridopts) if self.active == theme: - return # Don't need to mess with the window manager + return # Don't need to mess with the window manager else: self.active = theme - if platform == 'darwin': + if sys.platform == 'darwin': from AppKit import NSAppearance, NSApplication, NSMiniaturizableWindowMask, NSResizableWindowMask - root.update_idletasks() # need main window to be created + root.update_idletasks() # need main window to be created appearance = NSAppearance.appearanceNamed_(theme and 'NSAppearanceNameDarkAqua' or 'NSAppearanceNameAqua') for window in NSApplication.sharedApplication().windows(): - window.setStyleMask_(window.styleMask() & ~(NSMiniaturizableWindowMask | NSResizableWindowMask)) # disable zoom + window.setStyleMask_(window.styleMask() & ~( + NSMiniaturizableWindowMask | NSResizableWindowMask)) # disable zoom window.setAppearance_(appearance) - elif platform == 'win32': + elif sys.platform == 'win32': GWL_STYLE = -16 - WS_MAXIMIZEBOX = 0x00010000 + WS_MAXIMIZEBOX = 0x00010000 # tk8.5.9/win/tkWinWm.c:342 GWL_EXSTYLE = -20 - WS_EX_APPWINDOW = 0x00040000 - WS_EX_LAYERED = 0x00080000 + WS_EX_APPWINDOW = 0x00040000 + WS_EX_LAYERED = 0x00080000 GetWindowLongW = ctypes.windll.user32.GetWindowLongW SetWindowLongW = ctypes.windll.user32.SetWindowLongW root.overrideredirect(theme and 1 or 0) root.attributes("-transparentcolor", theme > 1 and 'grey4' or '') root.withdraw() - root.update_idletasks() # Size and windows styles get recalculated here + root.update_idletasks() # Size and windows styles get recalculated here hwnd = ctypes.windll.user32.GetParent(root.winfo_id()) - SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & ~WS_MAXIMIZEBOX) # disable maximize - SetWindowLongW(hwnd, GWL_EXSTYLE, theme > 1 and WS_EX_APPWINDOW|WS_EX_LAYERED or WS_EX_APPWINDOW) # Add to taskbar + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & ~WS_MAXIMIZEBOX) # disable maximize + SetWindowLongW(hwnd, GWL_EXSTYLE, theme > 1 and WS_EX_APPWINDOW | + WS_EX_LAYERED or WS_EX_APPWINDOW) # Add to taskbar root.deiconify() - root.wait_visibility() # need main window to be displayed before returning + root.wait_visibility() # need main window to be displayed before returning else: root.withdraw() - root.update_idletasks() # Size gets recalculated here + root.update_idletasks() # Size gets recalculated here if dpy: xroot = Window() parent = Window() children = Window() nchildren = c_uint() XQueryTree(dpy, root.winfo_id(), byref(xroot), byref(parent), byref(children), byref(nchildren)) - XChangeProperty(dpy, parent, motif_wm_hints_property, motif_wm_hints_property, 32, PropModeReplace, theme and motif_wm_hints_dark or motif_wm_hints_normal, 5) + XChangeProperty(dpy, parent, motif_wm_hints_property, motif_wm_hints_property, 32, + PropModeReplace, theme and motif_wm_hints_dark or motif_wm_hints_normal, 5) XFlush(dpy) else: root.overrideredirect(theme and 1 or 0) root.deiconify() - root.wait_visibility() # need main window to be displayed before returning + root.wait_visibility() # need main window to be displayed before returning if not self.minwidth: - self.minwidth = root.winfo_width() # Minimum width = width on first creation + self.minwidth = root.winfo_width() # Minimum width = width on first creation root.minsize(self.minwidth, -1) diff --git a/ttkHyperlinkLabel.py b/ttkHyperlinkLabel.py index 2f64ab74..8dd08644 100644 --- a/ttkHyperlinkLabel.py +++ b/ttkHyperlinkLabel.py @@ -1,14 +1,12 @@ +import sys import tkinter as tk import webbrowser -from sys import platform from tkinter import font as tkFont from tkinter import ttk -if platform == 'win32': +if sys.platform == 'win32': import subprocess - from winreg import ( - HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, CloseKey, OpenKeyEx, QueryValueEx - ) + from winreg import HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, CloseKey, OpenKeyEx, QueryValueEx # A clickable ttk Label # @@ -18,19 +16,22 @@ if platform == 'win32': # popup_copy: Whether right-click on non-empty label text pops up a context menu with a 'Copy' option. Defaults to no context menu. If popup_copy is a function it will be called with the current label text and should return a boolean. # # May be imported by plugins -class HyperlinkLabel(platform == 'darwin' and tk.Label or ttk.Label, object): + + +class HyperlinkLabel(sys.platform == 'darwin' and tk.Label or ttk.Label, object): def __init__(self, master=None, **kw): self.url = 'url' in kw and kw.pop('url') or None self.popup_copy = kw.pop('popup_copy', False) - self.underline = kw.pop('underline', None) # override ttk.Label's underline + self.underline = kw.pop('underline', None) # override ttk.Label's underline self.foreground = kw.get('foreground') or 'blue' - self.disabledforeground = kw.pop('disabledforeground', ttk.Style().lookup('TLabel', 'foreground', ('disabled',))) # ttk.Label doesn't support disabledforeground option + self.disabledforeground = kw.pop('disabledforeground', ttk.Style().lookup( + 'TLabel', 'foreground', ('disabled',))) # ttk.Label doesn't support disabledforeground option - if platform == 'darwin': + if sys.platform == 'darwin': # Use tk.Label 'cos can't set ttk.Label background - http://www.tkdocs.com/tutorial/styles.html#whydifficult kw['background'] = kw.pop('background', 'systemDialogBackgroundActive') - kw['anchor'] = kw.pop('anchor', tk.W) # like ttk.Label + kw['anchor'] = kw.pop('anchor', tk.W) # like ttk.Label tk.Label.__init__(self, master, **kw) else: ttk.Label.__init__(self, master, **kw) @@ -39,16 +40,16 @@ class HyperlinkLabel(platform == 'darwin' and tk.Label or ttk.Label, object): self.menu = tk.Menu(None, tearoff=tk.FALSE) # LANG: Label for 'Copy' as in 'Copy and Paste' - self.menu.add_command(label=_('Copy'), command = self.copy) # As in Copy and Paste - self.bind(platform == 'darwin' and '' or '', self._contextmenu) + self.menu.add_command(label=_('Copy'), command=self.copy) # As in Copy and Paste + self.bind(sys.platform == 'darwin' and '' or '', self._contextmenu) self.bind('', self._enter) self.bind('', self._leave) # set up initial appearance - self.configure(state = kw.get('state', tk.NORMAL), - text = kw.get('text'), - font = kw.get('font', ttk.Style().lookup('TLabel', 'font'))) + self.configure(state=kw.get('state', tk.NORMAL), + text=kw.get('text'), + font=kw.get('font', ttk.Style().lookup('TLabel', 'font'))) # Change cursor and appearance depending on state and text def configure(self, cnf=None, **kw): @@ -70,17 +71,18 @@ class HyperlinkLabel(platform == 'darwin' and tk.Label or ttk.Label, object): if 'font' in kw: self.font_n = kw['font'] - self.font_u = tkFont.Font(font = self.font_n) - self.font_u.configure(underline = True) + self.font_u = tkFont.Font(font=self.font_n) + self.font_u.configure(underline=True) kw['font'] = self.underline is True and self.font_u or self.font_n if 'cursor' not in kw: if (kw['state'] if 'state' in kw else str(self['state'])) == tk.DISABLED: - kw['cursor'] = 'arrow' # System default + kw['cursor'] = 'arrow' # System default elif self.url and (kw['text'] if 'text' in kw else self['text']): - kw['cursor'] = platform=='darwin' and 'pointinghand' or 'hand2' + kw['cursor'] = sys.platform == 'darwin' and 'pointinghand' or 'hand2' else: - kw['cursor'] = (platform=='darwin' and 'notallowed') or (platform=='win32' and 'no') or 'circle' + kw['cursor'] = (sys.platform == 'darwin' and 'notallowed') or ( + sys.platform == 'win32' and 'no') or 'circle' super(HyperlinkLabel, self).configure(cnf, **kw) @@ -89,22 +91,22 @@ class HyperlinkLabel(platform == 'darwin' and tk.Label or ttk.Label, object): def _enter(self, event): if self.url and self.underline is not False and str(self['state']) != tk.DISABLED: - super(HyperlinkLabel, self).configure(font = self.font_u) + super(HyperlinkLabel, self).configure(font=self.font_u) def _leave(self, event): if not self.underline: - super(HyperlinkLabel, self).configure(font = self.font_n) + super(HyperlinkLabel, self).configure(font=self.font_n) def _click(self, event): if self.url and self['text'] and str(self['state']) != tk.DISABLED: url = self.url(self['text']) if callable(self.url) else self.url if url: - self._leave(event) # Remove underline before we change window to browser + self._leave(event) # Remove underline before we change window to browser openurl(url) def _contextmenu(self, event): if self['text'] and (self.popup_copy(self['text']) if callable(self.popup_copy) else self.popup_copy): - self.menu.post(platform == 'darwin' and event.x_root + 1 or event.x_root, event.y_root) + self.menu.post(sys.platform == 'darwin' and event.x_root + 1 or event.x_root, event.y_root) def copy(self): self.clipboard_clear() @@ -112,13 +114,14 @@ class HyperlinkLabel(platform == 'darwin' and tk.Label or ttk.Label, object): def openurl(url): - if platform == 'win32': + if sys.platform == 'win32': # On Windows webbrowser.open calls os.startfile which calls ShellExecute which can't handle long arguments, # so discover and launch the browser directly. # https://blogs.msdn.microsoft.com/oldnewthing/20031210-00/?p=41553 try: - hkey = OpenKeyEx(HKEY_CURRENT_USER, r'Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice') + hkey = OpenKeyEx(HKEY_CURRENT_USER, + r'Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice') (value, typ) = QueryValueEx(hkey, 'ProgId') CloseKey(hkey) if value in ['IE.HTTP', 'AppXq0fevzme2pys62n3e0fbqa7peapykr8v']: @@ -128,7 +131,7 @@ def openurl(url): else: cls = value except: - cls = 'https' + cls = 'https' if cls: try: From f160acfe5721ea014abe93fda8c914363b747e57 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 14:19:18 +0200 Subject: [PATCH 310/527] add configs for switching platforms --- .mypy.ini | 1 + pyproject.toml | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.mypy.ini b/.mypy.ini index 03840fd9..f9ec5997 100644 --- a/.mypy.ini +++ b/.mypy.ini @@ -2,3 +2,4 @@ follow_imports = skip ignore_missing_imports = True scripts_are_modules = True +; platform = darwin diff --git a/pyproject.toml b/pyproject.toml index 35ab26e4..a7f41ad4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,10 +3,13 @@ max_line_length = 120 [tool.isort] multi_line_output = 5 -line_length = 119 +line_length = 119 [tool.pytest.ini_options] testpaths = ["tests"] # Search for tests in tests/ [tool.coverage.run] -omit = ["venv/*"] # when running pytest --cov, dont report coverage in venv directories +omit = ["venv/*"] # when running pytest --cov, dont report coverage in venv directories + +[tool.pyright] +# pythonPlatform = 'Darwin' From 7bcf3a6f4da7e2f6d7115121caaab35a290eaf85 Mon Sep 17 00:00:00 2001 From: A_D Date: Wed, 26 Jan 2022 17:46:30 +0200 Subject: [PATCH 311/527] note sys.platform requirements in contributing --- Contributing.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Contributing.md b/Contributing.md index bdbf4634..0b1f4d58 100644 --- a/Contributing.md +++ b/Contributing.md @@ -228,6 +228,7 @@ handy if you want to step through the testing code to be sure of anything. Otherwise, see the [pytest documentation](https://docs.pytest.org/en/stable/contents.html). --- + ## Debugging network sends Rather than risk sending bad data to a remote service, even if only through @@ -484,6 +485,20 @@ Please be verbose here, more info about weird choices is always prefered over ma Additionally, if your hack is over around 5 lines, please include a `# HACK END` or similar comment to indicate the end of the hack. +# Use `sys.platform` for platform guards + +`mypy` (and `pylance`) understand platform guards and will show unreachable code / resolve imports correctly +for platform specific things. However, this only works if you directly reference `sys.platform`, importantly +the following does not work: + +```py +from sys import platform +if platform == 'darwin': + ... +``` + +It **MUST** be `if sys.platform`. + --- ## Build process From 3814f9ebb9eba2f4607f3674ec8a9bf7936188e9 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 20 Jan 2022 23:20:10 +0200 Subject: [PATCH 312/527] Quick fix to a type warning --- plugins/eddn.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 37165ea1..f16c571e 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -168,6 +168,10 @@ class EDDN: def flush(self): """Flush the replay file, clearing any data currently there that is not in the replaylog list.""" + if self.replayfile is None: + logger.warning('replayfile is None!') + return + self.replayfile.seek(0, SEEK_SET) self.replayfile.truncate() for line in self.replaylog: From d65bcbbf0aeb5419f4d1da164849054f7797f9dd Mon Sep 17 00:00:00 2001 From: A_D Date: Fri, 21 Jan 2022 00:09:39 +0200 Subject: [PATCH 313/527] Added util directory and http util file HTTP utils are anything generally useful for HTTP things, currently thats just compressing a string if its larger than a given number of bytes. These libraries are intended to be available to plugins --- util/http.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 util/http.py diff --git a/util/http.py b/util/http.py new file mode 100644 index 00000000..441ff386 --- /dev/null +++ b/util/http.py @@ -0,0 +1,24 @@ +"""Utilities for dealing with HTTP.""" +from __future__ import annotations + +from gzip import compress + +__all__ = ['gzip'] + + +def gzip(data: str | bytes, max_size: int = 512, encoding='utf-8') -> tuple[bytes, bool]: + """ + Compress the given data if the max size is greater than specified. + + :param data: The data to compress + :param max_size: The max size of data, in bytes, defaults to 512 + :param encoding: The encoding to use if data is a str, defaults to 'utf-8' + :return: the payload to send, and a bool indicating compression state + """ + if isinstance(data, str): + data = data.encode(encoding=encoding) + + if len(data) <= max_size: + return data, False + + return compress(data), True From b780b1ab8e64d3c4a091014a0b3f5baa57e42575 Mon Sep 17 00:00:00 2001 From: A_D Date: Fri, 21 Jan 2022 00:12:51 +0200 Subject: [PATCH 314/527] Compress outgoing EDDN data if its large This is a sidestep solution to #1390. It doesn't attempt to directly resend data, only compressing with gzip over a given size. If that STILL returns a 413, its dropped, as without introspection of the message we cannot make it any smaller --- plugins/eddn.py | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index f16c571e..6275349f 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -10,6 +10,7 @@ from collections import OrderedDict from os import SEEK_SET from os.path import join from platform import system +from textwrap import dedent from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Mapping, MutableMapping, Optional from typing import OrderedDict as OrderedDictT from typing import TextIO, Tuple, Union @@ -27,6 +28,7 @@ from monitor import monitor from myNotebook import Frame from prefs import prefsVersion from ttkHyperlinkLabel import HyperlinkLabel +from util import http if sys.platform != 'win32': from fcntl import LOCK_EX, LOCK_NB, lockf @@ -217,7 +219,12 @@ class EDDN: ('message', msg['message']), ]) - r = self.session.post(self.eddn_url, data=json.dumps(to_send), timeout=self.TIMEOUT) + encoded, compressed = http.gzip(json.dumps(to_send)) + headers: None | dict[str, str] = None + if compressed: + headers = {'Content-Encoding': 'gzip'} + + r = self.session.post(self.eddn_url, data=encoded, timeout=self.TIMEOUT, headers=headers) if r.status_code != requests.codes.ok: # Check if EDDN is still objecting to an empty commodities list @@ -230,15 +237,31 @@ class EDDN: logger.trace_if('plugin.eddn', "EDDN is still objecting to empty commodities data") return # We want to silence warnings otherwise + from base64 import b64encode # we dont need this to be around until this point, which may never hit + if r.status_code == 413: + logger.debug(dedent( + f"""\ + Got a 413 while POSTing data + URL:\t{r.url} + Headers:\t{r.headers} + Sent Data Len:\t {len(encoded)} + Content:\n{r.text}\n + Msg:\n{msg} + Encoded:\n{b64encode(encoded).decode(errors="replace")} + """ + )) + + return # drop the error + if not self.UNKNOWN_SCHEMA_RE.match(r.text): - logger.debug( + logger.debug(dedent( f'''Status from POST wasn't OK: -Status\t{r.status_code} -URL\t{r.url} -Headers\t{r.headers} -Content:\n{r.text} -Msg:\n{msg}''' - ) + Status\t{r.status_code} + URL\t{r.url} + Headers\t{r.headers} + Content:\n{r.text} + Msg:\n{msg}''' + )) r.raise_for_status() From 2b8fe57bc755a4c20643c95a6798b37ec8f192ca Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 17:21:02 +0200 Subject: [PATCH 315/527] gzip decompress support for debug_webserver --- debug_webserver.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/debug_webserver.py b/debug_webserver.py index 3d1a671b..9b717ec0 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -1,4 +1,5 @@ """Simple HTTP listener to be used with debugging various EDMC sends.""" +import gzip import json import pathlib import tempfile @@ -30,7 +31,15 @@ class LoggingHandler(server.BaseHTTPRequestHandler): def do_POST(self) -> None: # noqa: N802 # I cant change it """Handle POST.""" logger.info(f"Received a POST for {self.path!r}!") - data = self.rfile.read(int(self.headers['Content-Length'])).decode('utf-8', errors='replace') + data_raw: bytes = self.rfile.read(int(self.headers['Content-Length'])) + data: str | bytes + + if self.headers.get('Content-Encoding') == 'gzip': + data = gzip.decompress(data_raw).decode('utf-8', errors='replace') + + else: + data = data_raw.decode('utf-8', errors='replace') + to_save = data target_path = self.path @@ -64,7 +73,7 @@ class LoggingHandler(server.BaseHTTPRequestHandler): target_file = output_data_path / (safe_file_name(target_path) + '.log') if target_file.parent != output_data_path: logger.warning(f"REFUSING TO WRITE FILE THAT ISN'T IN THE RIGHT PLACE! {target_file=}") - logger.warning(f'DATA FOLLOWS\n{data}') + logger.warning(f'DATA FOLLOWS\n{data}') # type: ignore # mypy thinks data is a byte string here return with output_lock, target_file.open('a') as f: From 73f45e37cde8147d722986b1df555e600a78effa Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 17:21:31 +0200 Subject: [PATCH 316/527] always compress eddn data, comment rationale --- plugins/eddn.py | 11 ++++++++++- util/http.py | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 6275349f..dd8e6cab 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -219,7 +219,16 @@ class EDDN: ('message', msg['message']), ]) - encoded, compressed = http.gzip(json.dumps(to_send)) + # About the smallest request is going to be (newlines added for brevity): + # {"$schemaRef":"https://eddn.edcd.io/schemas/shipyard/2","header":{"softwareName":"E:D Market + # Connector Windows","softwareVersion":"5.3.0-beta4extra","uploaderID":"abcdefghijklm"},"messa + # ge":{"systemName":"delphi","stationName":"The Oracle","marketID":128782803,"timestamp":"xxxx + # -xx-xxTxx:xx:xxZ","ships":[]}} + # + # Which comes to about around 307 bytes. Lets play it safe and make our minimum 0 bytes. + # Which compresses everything + + encoded, compressed = http.gzip(json.dumps(to_send, separators=(',', ':')), max_size=0) headers: None | dict[str, str] = None if compressed: headers = {'Content-Encoding': 'gzip'} diff --git a/util/http.py b/util/http.py index 441ff386..8a8578b9 100644 --- a/util/http.py +++ b/util/http.py @@ -10,6 +10,9 @@ def gzip(data: str | bytes, max_size: int = 512, encoding='utf-8') -> tuple[byte """ Compress the given data if the max size is greater than specified. + The default was chosen somewhat arbitrarily, see eddn.py for some more careful + work towards keeping the data almost always compressed + :param data: The data to compress :param max_size: The max size of data, in bytes, defaults to 512 :param encoding: The encoding to use if data is a str, defaults to 'utf-8' From 5f7234ce890c927df51065c95272d1fd46be37ea Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 21:17:50 +0200 Subject: [PATCH 317/527] address PR comments --- plugins/eddn.py | 21 ++++++++++----------- util/{http.py => text.py} | 0 2 files changed, 10 insertions(+), 11 deletions(-) rename util/{http.py => text.py} (100%) diff --git a/plugins/eddn.py b/plugins/eddn.py index dd8e6cab..964aa093 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -28,7 +28,7 @@ from monitor import monitor from myNotebook import Frame from prefs import prefsVersion from ttkHyperlinkLabel import HyperlinkLabel -from util import http +from util import text if sys.platform != 'win32': from fcntl import LOCK_EX, LOCK_NB, lockf @@ -171,7 +171,7 @@ class EDDN: def flush(self): """Flush the replay file, clearing any data currently there that is not in the replaylog list.""" if self.replayfile is None: - logger.warning('replayfile is None!') + logger.error('replayfile is None!') return self.replayfile.seek(0, SEEK_SET) @@ -220,15 +220,14 @@ class EDDN: ]) # About the smallest request is going to be (newlines added for brevity): - # {"$schemaRef":"https://eddn.edcd.io/schemas/shipyard/2","header":{"softwareName":"E:D Market - # Connector Windows","softwareVersion":"5.3.0-beta4extra","uploaderID":"abcdefghijklm"},"messa - # ge":{"systemName":"delphi","stationName":"The Oracle","marketID":128782803,"timestamp":"xxxx - # -xx-xxTxx:xx:xxZ","ships":[]}} + # {"$schemaRef":"https://eddn.edcd.io/schemas/commodity/3","header":{"softwareName":"E:D Market + # Connector Windows","softwareVersion":"5.3.0-beta4extra","uploaderID":"abcdefghijklm"},"messag + # e":{"systemName":"delphi","stationName":"The Oracle","marketId":128782803,"timestamp":"2022-0 + # 1-26T12:00:00Z","commodities":[]}} # - # Which comes to about around 307 bytes. Lets play it safe and make our minimum 0 bytes. - # Which compresses everything + # Which comes to 315 bytes (including \n) and compresses to 244 bytes. So lets just compress everything - encoded, compressed = http.gzip(json.dumps(to_send, separators=(',', ':')), max_size=0) + encoded, compressed = text.gzip(json.dumps(to_send, separators=(',', ':')), max_size=0) headers: None | dict[str, str] = None if compressed: headers = {'Content-Encoding': 'gzip'} @@ -249,7 +248,7 @@ class EDDN: from base64 import b64encode # we dont need this to be around until this point, which may never hit if r.status_code == 413: logger.debug(dedent( - f"""\ + f'''\ Got a 413 while POSTing data URL:\t{r.url} Headers:\t{r.headers} @@ -257,7 +256,7 @@ class EDDN: Content:\n{r.text}\n Msg:\n{msg} Encoded:\n{b64encode(encoded).decode(errors="replace")} - """ + ''' )) return # drop the error diff --git a/util/http.py b/util/text.py similarity index 100% rename from util/http.py rename to util/text.py From 45dba2ba880142ae5e6891569a17dce9e5a7ed41 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 24 Jan 2022 23:17:51 +0200 Subject: [PATCH 318/527] change module doc comment for text.py --- util/text.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/text.py b/util/text.py index 8a8578b9..0755f0f3 100644 --- a/util/text.py +++ b/util/text.py @@ -1,4 +1,4 @@ -"""Utilities for dealing with HTTP.""" +"""Utilities for dealing with text (and byte representations thereof).""" from __future__ import annotations from gzip import compress From 10824250e179aaad5bc2c9fc9a3cf6c146c65a24 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 15:09:30 +0200 Subject: [PATCH 319/527] add deflate support --- debug_webserver.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debug_webserver.py b/debug_webserver.py index 9b717ec0..1defdc5b 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -4,6 +4,7 @@ import json import pathlib import tempfile import threading +import zlib from http import server from typing import Any, Callable, Tuple, Union from urllib.parse import parse_qs @@ -34,6 +35,16 @@ class LoggingHandler(server.BaseHTTPRequestHandler): data_raw: bytes = self.rfile.read(int(self.headers['Content-Length'])) data: str | bytes + match self.headers.get('Content-Encoding'): + case 'gzip': + data = gzip.decompress(data_raw).decode('utf-8', errors='replace') + + case 'deflate': + zlib.decompress(data_raw).decode('utf-8', errors='replace') + + case _: + data = data_raw.decode('utf-8', errors='replace') + if self.headers.get('Content-Encoding') == 'gzip': data = gzip.decompress(data_raw).decode('utf-8', errors='replace') From ec6f333cfa2bd51b95c6aeac767dee2eeb16ac09 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 15:18:23 +0200 Subject: [PATCH 320/527] removed old code --- debug_webserver.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debug_webserver.py b/debug_webserver.py index 1defdc5b..f660ea05 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -45,12 +45,6 @@ class LoggingHandler(server.BaseHTTPRequestHandler): case _: data = data_raw.decode('utf-8', errors='replace') - if self.headers.get('Content-Encoding') == 'gzip': - data = gzip.decompress(data_raw).decode('utf-8', errors='replace') - - else: - data = data_raw.decode('utf-8', errors='replace') - to_save = data target_path = self.path From 1c190dd76fb2ef5b010ff4ffc944f2d6baf74718 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 17:11:23 +0200 Subject: [PATCH 321/527] drop match statement --- debug_webserver.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/debug_webserver.py b/debug_webserver.py index f660ea05..024f39b9 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -35,15 +35,13 @@ class LoggingHandler(server.BaseHTTPRequestHandler): data_raw: bytes = self.rfile.read(int(self.headers['Content-Length'])) data: str | bytes - match self.headers.get('Content-Encoding'): - case 'gzip': - data = gzip.decompress(data_raw).decode('utf-8', errors='replace') + encoding = self.headers.get('Content-Encoding') - case 'deflate': - zlib.decompress(data_raw).decode('utf-8', errors='replace') + if encoding in ('gzip', 'deflate'): + data = zlib.decompress(data_raw).decode('utf-8', errors='replace') - case _: - data = data_raw.decode('utf-8', errors='replace') + else: + data = data_raw.decode('utf-8', errors='replace') to_save = data From e6ffe7e5208615e79fa2b2ee4c080e2d21d03116 Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 25 Jan 2022 17:11:35 +0200 Subject: [PATCH 322/527] refactor error logging --- plugins/eddn.py | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 964aa093..74bab79d 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -245,34 +245,40 @@ class EDDN: logger.trace_if('plugin.eddn', "EDDN is still objecting to empty commodities data") return # We want to silence warnings otherwise - from base64 import b64encode # we dont need this to be around until this point, which may never hit if r.status_code == 413: - logger.debug(dedent( - f'''\ - Got a 413 while POSTing data - URL:\t{r.url} - Headers:\t{r.headers} - Sent Data Len:\t {len(encoded)} - Content:\n{r.text}\n - Msg:\n{msg} - Encoded:\n{b64encode(encoded).decode(errors="replace")} - ''' - )) - + self._log_response(r, header_msg='Got a 413 while POSTing data', sent_data_len=str(len(encoded))) return # drop the error if not self.UNKNOWN_SCHEMA_RE.match(r.text): - logger.debug(dedent( - f'''Status from POST wasn't OK: - Status\t{r.status_code} - URL\t{r.url} - Headers\t{r.headers} - Content:\n{r.text} - Msg:\n{msg}''' - )) + self._log_response(r, header_msg='Status from POST wasn\'t 200 (OK)') r.raise_for_status() + def _log_response( + self, + response: requests.Response, + header_msg='Failed to POST to EDDN', + **kwargs + ) -> None: + """ + Log a response object with optional additional data. + + :param response: The response to log + :param header_msg: A header message to add to the log, defaults to 'Failed to POST to EDDN' + :param kwargs: Any other notes to add, will be added below the main data in the same format. + """ + additional_data = "\n".join( + f'''{name.replace('_', ' ').title():<8}:\t{value}''' for name, value in kwargs.items() + ) + + logger.debug(dedent(f''' + {header_msg}: + Status :\t{response.status_code} + URL :\t{response.url} + Headers :\t{response.headers} + Content :\t{response.text} + '''+additional_data)) + def sendreplay(self) -> None: # noqa: CCR001 """Send cached Journal lines to EDDN.""" if not self.replayfile: From f753ce4308d5cb4753152ec48c15ee8bdb3b259c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 17:03:23 +0000 Subject: [PATCH 323/527] build(deps-dev): bump coverage[toml] from 6.2 to 6.3 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.2 to 6.3. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.2...6.3) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d746f046..a1911c5f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -35,7 +35,7 @@ py2exe==0.11.0.1; sys_platform == 'win32' # Testing pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.3 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==303; sys_platform == 'win32' From e891ee4da026816951532f59d86c3189795a65c6 Mon Sep 17 00:00:00 2001 From: A_D Date: Wed, 26 Jan 2022 19:05:00 +0200 Subject: [PATCH 324/527] log more contextual data if possible on a 413 --- plugins/eddn.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 74bab79d..76e2f227 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -6,6 +6,7 @@ import pathlib import re import sys import tkinter as tk +from base64 import encode from collections import OrderedDict from os import SEEK_SET from os.path import join @@ -246,7 +247,15 @@ class EDDN: return # We want to silence warnings otherwise if r.status_code == 413: - self._log_response(r, header_msg='Got a 413 while POSTing data', sent_data_len=str(len(encoded))) + extra_data = { + 'schema_ref': msg.get('$schemaRef', 'Unset $schemaRef!'), + 'sent_data_len': str(len(encoded)), + } + + if '/journal/' in extra_data['schema_ref']: + extra_data['event'] = msg.get('message', {}).get('event', 'No Event Set') + + self._log_response(r, header_msg='Got a 413 while POSTing data', **extra_data) return # drop the error if not self.UNKNOWN_SCHEMA_RE.match(r.text): From 3a4690d292807d0a35d8988b09f3b77891e6c6ff Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 26 Jan 2022 17:28:45 +0000 Subject: [PATCH 325/527] monitor: Gate navroute on *not* being in journal catch up mode We can't just use `EDLogs.live` here as it'll get set `true` when the `Commander` event is seen *during the catch up*. We need that catchup to have finished before we'll try processing a `NavRoute` event and file. --- monitor.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index 42d282b1..40259ece 100644 --- a/monitor.py +++ b/monitor.py @@ -95,6 +95,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below # If 1 or 2 a LoadGame event will happen when the game goes live. # If 3 we need to inject a special 'StartUp' event since consumers won't see the LoadGame event. self.live = False + # And whilst we're parsing *only to catch up on state*, we might not want to fully process some things + self.catching_up = False self.game_was_running = False # For generation of the "ShutDown" event @@ -342,6 +344,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below if platform == 'darwin': fcntl(loghandle, F_GLOBAL_NOCACHE, -1) # required to avoid corruption on macOS over SMB + self.catching_up = True for line in loghandle: try: if b'"event":"Location"' in line: @@ -352,6 +355,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below except Exception as ex: logger.debug(f'Invalid journal entry:\n{line!r}\n', exc_info=ex) + self.catching_up = False log_pos = loghandle.tell() else: @@ -1314,7 +1318,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.state['Credits'] += entry.get('Refund', 0) self.state['Taxi'] = False - elif event_type == 'navroute': + elif event_type == 'navroute' and not self.catching_up: # assume we've failed out the gate, then pull it back if things are fine self._last_navroute_journal_timestamp = mktime(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) self._navroute_retries_remaining = 11 From 8c2a0ae95afb1c4a54d6cde5b2d6ae8f2fbe5f9b Mon Sep 17 00:00:00 2001 From: A_D Date: Wed, 26 Jan 2022 20:36:29 +0200 Subject: [PATCH 326/527] make tests not explode on windows --- config/linux.py | 2 +- tests/config.py/test_config.py | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/config/linux.py b/config/linux.py index 04087b32..58c0f7cd 100644 --- a/config/linux.py +++ b/config/linux.py @@ -3,7 +3,7 @@ import os import pathlib import sys from configparser import ConfigParser -from typing import List, Optional, Union +from typing import TYPE_CHECKING, List, Optional, Union from config import AbstractConfig, appname, logger diff --git a/tests/config.py/test_config.py b/tests/config.py/test_config.py index 0d10a3c2..4f72d437 100644 --- a/tests/config.py/test_config.py +++ b/tests/config.py/test_config.py @@ -1,4 +1,12 @@ -"""Test the config system.""" +""" +Test the config system. + +Note: These tests to arbitrary reads and writes to an existing config, including +key deletions. Said modifications are to keys that are generated internally. + +Most of these tests are parity tests with the "old" config, and likely one day can be +entirely removed. +""" from __future__ import annotations import contextlib @@ -19,7 +27,7 @@ print(sys.path) from _old_config import old_config # noqa: E402 -from config import LinuxConfig, config # noqa: E402 +from config import config # noqa: E402 def _fuzz_list(length: int) -> List[str]: @@ -77,6 +85,11 @@ class TestNewConfig: def __update_linuxconfig(self) -> None: """On linux config uses ConfigParser, which doesn't update from disk changes. Force the update here.""" + if sys.platform != 'linux': + return + + from config.linux import LinuxConfig + if isinstance(config, LinuxConfig) and config.config is not None: config.config.read(config.filename) @@ -163,6 +176,10 @@ class TestOldNewConfig: def __update_linuxconfig(self) -> None: """On linux config uses ConfigParser, which doesn't update from disk changes. Force the update here.""" + if sys.platform != 'linux': + return + + from config.linux import LinuxConfig if isinstance(config, LinuxConfig) and config.config is not None: config.config.read(config.filename) From 6c0cb45e61b9fd1d553bfcc8cab676bdaf1daa19 Mon Sep 17 00:00:00 2001 From: A_D Date: Wed, 26 Jan 2022 22:40:09 +0200 Subject: [PATCH 327/527] removed unused import --- debug_webserver.py | 1 - 1 file changed, 1 deletion(-) diff --git a/debug_webserver.py b/debug_webserver.py index 024f39b9..ccce5f9d 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -1,5 +1,4 @@ """Simple HTTP listener to be used with debugging various EDMC sends.""" -import gzip import json import pathlib import tempfile From d6dcebf545ba13e4d8e25b4369172bcb97b440dc Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 27 Jan 2022 14:59:27 +0200 Subject: [PATCH 328/527] Remove unused import --- plugins/eddn.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 76e2f227..a423876e 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -6,7 +6,6 @@ import pathlib import re import sys import tkinter as tk -from base64 import encode from collections import OrderedDict from os import SEEK_SET from os.path import join From 38f35403c92320254d2d0cab879b0eaa79612c1d Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 27 Jan 2022 16:02:06 +0200 Subject: [PATCH 329/527] fix gzip support in debug_webserver --- debug_webserver.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debug_webserver.py b/debug_webserver.py index ccce5f9d..0a456dc9 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -1,4 +1,5 @@ """Simple HTTP listener to be used with debugging various EDMC sends.""" +import gzip import json import pathlib import tempfile @@ -36,7 +37,10 @@ class LoggingHandler(server.BaseHTTPRequestHandler): encoding = self.headers.get('Content-Encoding') - if encoding in ('gzip', 'deflate'): + if encoding == 'gzip': + data = gzip.decompress(data_raw).decode('utf-8', errors='replace') + + elif encoding == 'deflate': data = zlib.decompress(data_raw).decode('utf-8', errors='replace') else: From 17c886af84f7f1c03779ade0c5da989cf3c1d424 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 27 Jan 2022 16:03:03 +0200 Subject: [PATCH 330/527] fix log --- plugins/eddn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index a423876e..e3e4e198 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -279,13 +279,13 @@ class EDDN: f'''{name.replace('_', ' ').title():<8}:\t{value}''' for name, value in kwargs.items() ) - logger.debug(dedent(f''' + logger.debug(dedent(f'''\ {header_msg}: Status :\t{response.status_code} URL :\t{response.url} Headers :\t{response.headers} Content :\t{response.text} - '''+additional_data)) + ''')+additional_data) def sendreplay(self) -> None: # noqa: CCR001 """Send cached Journal lines to EDDN.""" From 0d68c454a58b83abe85af8caa792e751c23b3683 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 27 Jan 2022 16:28:43 +0000 Subject: [PATCH 331/527] Add .editorconfig * The settings are for all file types, we might have some exceptions, i.e. .xml files. * This is based on what we've been doing all along. Only the max line length has previously been codified in, e.g. pyproject.toml. We've not even codified things like "4-space indentations, expanded from TABs" in Contributing.md. --- .editorconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..7dcb0a42 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +# This is the project top-level .editorconfig +root = true + +# Defaults for all file types +[*] +# 4-space indents, no TABs +indent_style = space +tab_width = 4 +indent_size = tab + +# Hard-wrap at 120 columns +max_line_length = 119 + +# Unix EOL +end_of_line = lf + +# UTF-8 is the only sensible option, no BOM +charset = utf-8 + +# All files should have a final newline +insert_final_newline = true From f36d45d4bc70062b89545de5ac47e29146b50f64 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 27 Jan 2022 16:36:41 +0000 Subject: [PATCH 332/527] Contributing: Add section on text formatting / .editorconfig --- Contributing.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Contributing.md b/Contributing.md index 0b1f4d58..e61fe764 100644 --- a/Contributing.md +++ b/Contributing.md @@ -23,6 +23,16 @@ consistent with our vision for EDMC. Fundamental changes in particular need to b --- +## Text formatting + +The project contains an `.editorconfig` file at its root. Please either ensure +your editor is taking note of those settings, or cross-check its contents +with the +[editorconfig documentation](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties) +, and ensure your editor/IDE's settings match. + +--- + ## General workflow 1. You will need a GitHub account. From cdba879369c3b3818aff1cd05671016439a5fc88 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 27 Jan 2022 16:37:20 +0000 Subject: [PATCH 333/527] .editorconfig: Actually, we use crlf, with git converting --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 7dcb0a42..9f588ce0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ indent_size = tab max_line_length = 119 # Unix EOL -end_of_line = lf +end_of_line = crlf # UTF-8 is the only sensible option, no BOM charset = utf-8 From 32f98ea6dee5bbc0762e2c115083e390046b4c2b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 27 Jan 2022 17:01:49 +0000 Subject: [PATCH 334/527] .editorconfig: Fix the EOL comment --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 9f588ce0..adbf367f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,7 +11,7 @@ indent_size = tab # Hard-wrap at 120 columns max_line_length = 119 -# Unix EOL +# Windows EOL, for historical reasons end_of_line = crlf # UTF-8 is the only sensible option, no BOM From f4ba4775f2424244ed5467d55760bd3a3a819642 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 27 Jan 2022 19:40:06 +0200 Subject: [PATCH 335/527] pull decode/decompress out into its own function --- debug_webserver.py | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/debug_webserver.py b/debug_webserver.py index 0a456dc9..26e02714 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -6,7 +6,7 @@ import tempfile import threading import zlib from http import server -from typing import Any, Callable, Tuple, Union +from typing import Any, Callable, Literal, Tuple, Union from urllib.parse import parse_qs from config import appname @@ -37,16 +37,7 @@ class LoggingHandler(server.BaseHTTPRequestHandler): encoding = self.headers.get('Content-Encoding') - if encoding == 'gzip': - data = gzip.decompress(data_raw).decode('utf-8', errors='replace') - - elif encoding == 'deflate': - data = zlib.decompress(data_raw).decode('utf-8', errors='replace') - - else: - data = data_raw.decode('utf-8', errors='replace') - - to_save = data + to_save = self.get_printable(data_raw, encoding) target_path = self.path if len(target_path) > 1 and target_path[0] == '/': @@ -57,7 +48,7 @@ class LoggingHandler(server.BaseHTTPRequestHandler): response: Union[Callable[[str], str], str, None] = DEFAULT_RESPONSES.get(target_path) if callable(response): - response = response(data) + response = response(to_save) self.send_response_only(200, "OK") if response is not None: @@ -85,6 +76,31 @@ class LoggingHandler(server.BaseHTTPRequestHandler): with output_lock, target_file.open('a') as f: f.write(to_save + "\n\n") + @staticmethod + def get_printable(data: bytes, compression: Literal['deflate'] | Literal['gzip'] | str | None = None) -> str: + """ + Convert an incoming data stream into a string. + + :param data: The data to convert + :param compression: The compression to remove, defaults to None + :raises ValueError: If compression is unknown + :return: printable strings + """ + ret: bytes = b'' + if compression is None: + ret = data + + elif compression == 'deflate': + ret = zlib.decompress(data) + + elif compression == 'gzip': + ret = gzip.decompress(data) + + else: + raise ValueError(f'Unknown encoding for data {compression!r}') + + return ret.decode('utf-8', errors='replace') + def safe_file_name(name: str): """ From b180f34f167f651c3bd30eda8bc977a2f4cd0271 Mon Sep 17 00:00:00 2001 From: A_D Date: Thu, 27 Jan 2022 19:52:51 +0200 Subject: [PATCH 336/527] fix bugs that were hidden --- debug_webserver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debug_webserver.py b/debug_webserver.py index 26e02714..ace82a33 100644 --- a/debug_webserver.py +++ b/debug_webserver.py @@ -33,11 +33,10 @@ class LoggingHandler(server.BaseHTTPRequestHandler): """Handle POST.""" logger.info(f"Received a POST for {self.path!r}!") data_raw: bytes = self.rfile.read(int(self.headers['Content-Length'])) - data: str | bytes encoding = self.headers.get('Content-Encoding') - to_save = self.get_printable(data_raw, encoding) + to_save = data = self.get_printable(data_raw, encoding) target_path = self.path if len(target_path) > 1 and target_path[0] == '/': @@ -134,6 +133,7 @@ def generate_inara_response(raw_data: str) -> str: def extract_edsm_data(data: str) -> dict[str, Any]: + """Extract relevant data from edsm data.""" res = parse_qs(data) return {name: data[0] for name, data in res.items()} From 02dd800c5718d3bddb6439e3e9ef724ed710bb89 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 31 Jan 2022 14:50:12 +0000 Subject: [PATCH 337/527] Inara: Change the way we determine if a credits delta is interesting Now based on the *minimum* of a fractional or absolute change. See for discussion. --- plugins/inara.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index be4f35ac..abc45d5e 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -33,7 +33,10 @@ if TYPE_CHECKING: _TIMEOUT = 20 FAKE = ('CQC', 'Training', 'Destination') # Fake systems that shouldn't be sent to Inara -CREDIT_RATIO = 1.05 # Update credits if they change by 5% over the course of a session +# We only update Credits to Inara if the delta from the last sent value is +# greater than certain thresholds +CREDITS_DELTA_MIN_FRACTION = 0.05 # Fractional difference threshold +CREDITS_DELTA_MIN_ABSOLUTE = 10_000_000 # Absolute difference threshold # These need to be defined above This @@ -1358,7 +1361,10 @@ def cmdr_data(data: CAPIData, is_beta): # noqa: CCR001 this.station_link.update_idletasks() if config.get_int('inara_out') and not is_beta and not this.multicrew and credentials(this.cmdr): - if not (CREDIT_RATIO > this.last_credits / data['commander']['credits'] > 1 / CREDIT_RATIO): + if ( + abs(this.last_credits - data['commander']['credits']) >= + min(this.last_credits * CREDITS_DELTA_MIN_FRACTION, CREDITS_DELTA_MIN_ABSOLUTE) + ): this.filter_events( Credentials(this.cmdr, this.FID, str(credentials(this.cmdr))), lambda e: e.name != 'setCommanderCredits' From adb8055f0871b17eeec912e4f319f9288e8aae9b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 31 Jan 2022 15:22:36 +0000 Subject: [PATCH 338/527] Inara: Be paranoid in case of -ve credits balance --- plugins/inara.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/inara.py b/plugins/inara.py index abc45d5e..08b3b86d 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -1363,7 +1363,7 @@ def cmdr_data(data: CAPIData, is_beta): # noqa: CCR001 if config.get_int('inara_out') and not is_beta and not this.multicrew and credentials(this.cmdr): if ( abs(this.last_credits - data['commander']['credits']) >= - min(this.last_credits * CREDITS_DELTA_MIN_FRACTION, CREDITS_DELTA_MIN_ABSOLUTE) + min(abs(this.last_credits * CREDITS_DELTA_MIN_FRACTION), CREDITS_DELTA_MIN_ABSOLUTE) ): this.filter_events( Credentials(this.cmdr, this.FID, str(credentials(this.cmdr))), From 3e0c69be5e2f48ddbc1b4c786be353a4ed90e869 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 31 Jan 2022 15:41:25 +0000 Subject: [PATCH 339/527] docs: Pass for config.py -> config/__init__.py and related changes --- Contributing.md | 11 ++++++----- docs/Releasing.md | 21 +++++++++++---------- tests/{config.py => config}/_old_config.py | 0 tests/{config.py => config}/test_config.py | 0 4 files changed, 17 insertions(+), 15 deletions(-) rename tests/{config.py => config}/_old_config.py (100%) rename tests/{config.py => config}/test_config.py (100%) diff --git a/Contributing.md b/Contributing.md index e61fe764..02919c2f 100644 --- a/Contributing.md +++ b/Contributing.md @@ -191,9 +191,10 @@ only the 'C' (Patch) component. Going forwards we will always use the full [Semantic Version](https://semver.org/#semantic-versioning-specification-semver) and 'folder style' tag names, e.g. `Release/Major.Minor.Patch`. -Currently the only file that defines the version code-wise is `config.py`. -`Changelog.md` and `edmarketconnector.xml` are another matter handled as part -of [the release process](docs/Releasing.md#distribution). +Currently, the only file that defines the version code-wise is +`config/__init__.py`. `Changelog.md` and `edmarketconnector.xml` are another +matter handled as part of +[the release process](docs/Releasing.md#distribution). --- @@ -216,12 +217,12 @@ re-introduce a bug down the line. We use the [`pytest`](https://docs.pytest.org/en/stable/) for unit testing. The files for a test should go in a sub-directory of `tests/` named after the -(principal) file that contains the code they are testing. e.g. for +(principal) file or directory that contains the code they are testing. e.g. for journal_lock.py the tests are in `tests/journal_lock.py/test_journal_lock.py`. The `test_` prefix on `test_journal_lock.py` is necessary in order for `pytest` to recognise the file as containing tests to be run. The sub-directory avoids having a mess of files in `tests`, particularly when -there might be supporting files, e.g. `tests/config.py/_old_config.py` or files +there might be supporting files, e.g. `tests/config/_old_config.py` or files containing test data. Invoking just a bare `pytest` command will run all tests. diff --git a/docs/Releasing.md b/docs/Releasing.md index 50f5d0d6..73114b4c 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -17,7 +17,8 @@ this document aims to enable anyone to quickly get up to speed on how to: available versions and asks the user to upgrade. Note that for Windows only a 32-bit application is supported at this time. -This is principally due to the Windows Registry handling in config.py. +This is principally due to the Windows Registry handling in +`config/windows.py`. # Environment @@ -103,7 +104,7 @@ that. registry entries on Windows. 1. Application names, version and URL of the file with latest release - information. These are all in the `config.py` file. See the + information. These are all in the `config/__init__.py` file. See the `from config import ...` lines in setup.py. 1. `appname`: The short appname, e.g. 'EDMarketConnector' 2. `applongname`: The long appname, e.g. 'E:D Market Connector' @@ -206,24 +207,24 @@ following. 1. You should by this time know what changes are going into the release, and which branch (stable or beta) you'll be ultimately updating. -1. So as to make backing out any mistakes easier create a new branch for this +2. So as to make backing out any mistakes easier create a new branch for this release, using a name like `release-4.0.2`. Do not use the tag `Release/4.0.2` form, that could cause confusion. 1. `git checkout stable` # Or whichever other branch is appropriate. 1. `git pull origin` # Ensures local branch is up to date. 1. `git checkout -b release-4.0.2` -1. Get all the relevant code changes into this branch. This might mean +3. Get all the relevant code changes into this branch. This might mean merging from another branch, such as an issue-specific one, or possibly cherry-picking commits. See [Contributing Guidelines](../Contributing.md) for how such branches should be named. -1. You should have already decided on the new -[Version String](#Version-Strings), as it's specified in `config.py`. You'll -need to redo the `.msi` build if you forgot. **Remember to do a fresh git -commit for this change.** +4. You should have already decided on the new +[Version String](#Version-Strings), as it's specified in `config/__init__.py`. +You'll need to redo the `.msi` build if you forgot. **Remember to do a fresh +git commit for this change.** -1. Prepare a changelog text for the release. You'll need this both for the +5. Prepare a changelog text for the release. You'll need this both for the GitHub release and the contents of the `edmarketconnector.xml` file if making a `stable` release, as well as any social media posts you make. 1. The primary location of the changelog is [Changelog.md](../Changelog.md) - @@ -408,7 +409,7 @@ changelog text to the correct section(s): `https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml` - as per `config.py` `update_feed`. + as per `config/__init__.py` `update_feed`. NB: It can take some time for GitHub to show the changed edmarketconnector.xml contents to all users. diff --git a/tests/config.py/_old_config.py b/tests/config/_old_config.py similarity index 100% rename from tests/config.py/_old_config.py rename to tests/config/_old_config.py diff --git a/tests/config.py/test_config.py b/tests/config/test_config.py similarity index 100% rename from tests/config.py/test_config.py rename to tests/config/test_config.py From 9af6474d3ca2761e3ec676292f6d3d859418642a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 31 Jan 2022 15:45:40 +0000 Subject: [PATCH 340/527] docs: Further config.py -> config tweaks --- Contributing.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Contributing.md b/Contributing.md index 02919c2f..100b43ff 100644 --- a/Contributing.md +++ b/Contributing.md @@ -217,10 +217,16 @@ re-introduce a bug down the line. We use the [`pytest`](https://docs.pytest.org/en/stable/) for unit testing. The files for a test should go in a sub-directory of `tests/` named after the -(principal) file or directory that contains the code they are testing. e.g. for -journal_lock.py the tests are in `tests/journal_lock.py/test_journal_lock.py`. -The `test_` prefix on `test_journal_lock.py` is necessary in order for `pytest` -to recognise the file as containing tests to be run. +(principal) file or directory that contains the code they are testing. +For example: + +- Tests for `journal_lock.py` are in + `tests/journal_lock.py/test_journal_lock.py`. The `test_` prefix on + `test_journal_lock.py` is necessary in order for `pytest` to recognise the + file as containing tests to be run. +- Tests for `config/` code are located in `tests/config/test_config.py`, not + `tests/config.py/test_config.py` + The sub-directory avoids having a mess of files in `tests`, particularly when there might be supporting files, e.g. `tests/config/_old_config.py` or files containing test data. From d03c06b47f466398bb8cd3331948351a241bc8f0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 31 Jan 2022 16:35:41 +0000 Subject: [PATCH 341/527] appversion: Bump to 3.5.0-beta6 in develop for uniqueness --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index eff2859b..0ad38b97 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta4' +_static_appversion = '5.3.0-beta6' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From c13d19d5457d83d6e76128186fd8809dc22535e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 17:04:08 +0000 Subject: [PATCH 342/527] build(deps-dev): bump types-requests from 2.27.7 to 2.27.8 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.7 to 2.27.8. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a1911c5f..3d9976a9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.7 +types-requests==2.27.8 # Code formatting tools autopep8==1.6.0 From 1bca798fc6f66e6e060a41576fa676baa32c165f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 31 Jan 2022 18:29:08 +0000 Subject: [PATCH 343/527] python version: Some docs updates --- ChangeLog.md | 2 +- docs/Releasing.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 5c2f7e73..81a9a609 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.10.1. +* We now test against, and package with, Python 3.10.2. **As a consequence of this we no longer support Windows 7. This is due to diff --git a/docs/Releasing.md b/docs/Releasing.md index 73114b4c..d311c85a 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -439,6 +439,8 @@ When changing the Python version (Major.Minor.Patch) used: 1. `.github/workflows/windows-build.yml` needs updating to have the GitHub based build use the correct version. + 2. `ChangeLog.md` - The `We now test against, and package with, Python + M.m.P.` line. 1. Major or Minor level changes: From 5aa7b98cf6324b1ff2fe9c4f4c3f42914a634b25 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 14:14:43 +0000 Subject: [PATCH 344/527] setup.py: Add `util/` to win32 packages Currently only `plugins/eddn.py` imports anything from `util/`, and as the core plugins are dynamically loaded py2exe can't possibly know about this. So we need to specify it explictly. Tested with build and install, and also manually checking the resulting library.zip: ``` 0$ unzip -l library.zip | grep 'util/' 10582 2022-02-01 14:12 urllib3/util/url.pyc 11221 2022-02-01 14:12 urllib3/util/ssl_.pyc 3367 2022-02-01 14:12 urllib3/util/connection.pyc 1031 2022-02-01 14:12 urllib3/util/__init__.pyc 1266 2022-02-01 14:12 urllib3/util/proxy.pyc 3394 2022-02-01 14:12 urllib3/util/request.pyc 8863 2022-02-01 14:12 urllib3/util/timeout.pyc 986 2022-02-01 14:12 urllib3/util/queue.pyc 7332 2022-02-01 14:12 urllib3/util/ssltransport.pyc 1105 2022-02-01 14:12 util/text.pyc 3015 2022-02-01 14:12 urllib3/util/wait.pyc 110 2022-02-01 14:12 util/__init__.pyc 15704 2022-02-01 14:12 urllib3/util/retry.pyc 2279 2022-02-01 14:12 urllib3/util/response.pyc ``` --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index f73dc370..57383fe7 100755 --- a/setup.py +++ b/setup.py @@ -192,6 +192,7 @@ elif sys.platform == 'win32': 'optimize': 2, 'packages': [ 'sqlite3', # Included for plugins + 'util', # 2022-02-01 only imported in plugins/eddn.py ], 'includes': [ 'dataclasses', From ac7cfb9b147fd0e90aa7ffeff81ef133f5d74399 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 14:45:30 +0000 Subject: [PATCH 345/527] core plugins: Add big obvious comment about imports and windows installer --- plugins/coriolis.py | 22 ++++++++++++++++++++++ plugins/eddb.py | 22 ++++++++++++++++++++++ plugins/eddn.py | 22 ++++++++++++++++++++++ plugins/edsm.py | 22 ++++++++++++++++++++++ plugins/edsy.py | 22 ++++++++++++++++++++++ plugins/inara.py | 22 ++++++++++++++++++++++ 6 files changed, 132 insertions(+) diff --git a/plugins/coriolis.py b/plugins/coriolis.py index c05ba089..78ae1b41 100644 --- a/plugins/coriolis.py +++ b/plugins/coriolis.py @@ -1,5 +1,27 @@ """Coriolis ship export.""" +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# +# This is an EDMC 'core' plugin. +# +# All EDMC plugins are *dynamically* loaded at run-time. +# +# We build for Windows using `py2exe`. +# +# `py2exe` can't possibly know about anything in the dynamically loaded +# core plugins. +# +# Thus you **MUST** check if any imports you add in this file are only +# referenced in this file (or only in any other core plugin), and if so... +# +# YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN `setup.py` +# SO AS TO ENSURE THE FILES ARE ACTUALLY PRESENT IN AN END-USER +# INSTALLATION ON WINDOWS. +# +# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# import base64 import gzip import io diff --git a/plugins/eddb.py b/plugins/eddb.py index 220046f0..111d768c 100644 --- a/plugins/eddb.py +++ b/plugins/eddb.py @@ -23,6 +23,28 @@ # +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# +# This is an EDMC 'core' plugin. +# +# All EDMC plugins are *dynamically* loaded at run-time. +# +# We build for Windows using `py2exe`. +# +# `py2exe` can't possibly know about anything in the dynamically loaded +# core plugins. +# +# Thus you **MUST** check if any imports you add in this file are only +# referenced in this file (or only in any other core plugin), and if so... +# +# YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN `setup.py` +# SO AS TO ENSURE THE FILES ARE ACTUALLY PRESENT IN AN END-USER +# INSTALLATION ON WINDOWS. +# +# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# import sys from typing import TYPE_CHECKING, Any, Optional diff --git a/plugins/eddn.py b/plugins/eddn.py index e3e4e198..d58eac26 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1,5 +1,27 @@ """Handle exporting data to EDDN.""" +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# +# This is an EDMC 'core' plugin. +# +# All EDMC plugins are *dynamically* loaded at run-time. +# +# We build for Windows using `py2exe`. +# +# `py2exe` can't possibly know about anything in the dynamically loaded +# core plugins. +# +# Thus you **MUST** check if any imports you add in this file are only +# referenced in this file (or only in any other core plugin), and if so... +# +# YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN `setup.py` +# SO AS TO ENSURE THE FILES ARE ACTUALLY PRESENT IN AN END-USER +# INSTALLATION ON WINDOWS. +# +# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# import itertools import json import pathlib diff --git a/plugins/edsm.py b/plugins/edsm.py index 31f5a317..6bbf0223 100644 --- a/plugins/edsm.py +++ b/plugins/edsm.py @@ -9,6 +9,28 @@ # 4) Ensure the EDSM API call(back) for setting the image at end of system # text is always fired. i.e. CAPI cmdr_data() processing. +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# +# This is an EDMC 'core' plugin. +# +# All EDMC plugins are *dynamically* loaded at run-time. +# +# We build for Windows using `py2exe`. +# +# `py2exe` can't possibly know about anything in the dynamically loaded +# core plugins. +# +# Thus you **MUST** check if any imports you add in this file are only +# referenced in this file (or only in any other core plugin), and if so... +# +# YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN `setup.py` +# SO AS TO ENSURE THE FILES ARE ACTUALLY PRESENT IN AN END-USER +# INSTALLATION ON WINDOWS. +# +# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# import json import threading import tkinter as tk diff --git a/plugins/edsy.py b/plugins/edsy.py index 7da92fa4..df61683e 100644 --- a/plugins/edsy.py +++ b/plugins/edsy.py @@ -1,5 +1,27 @@ # EDShipyard ship export +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# +# This is an EDMC 'core' plugin. +# +# All EDMC plugins are *dynamically* loaded at run-time. +# +# We build for Windows using `py2exe`. +# +# `py2exe` can't possibly know about anything in the dynamically loaded +# core plugins. +# +# Thus you **MUST** check if any imports you add in this file are only +# referenced in this file (or only in any other core plugin), and if so... +# +# YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN `setup.py` +# SO AS TO ENSURE THE FILES ARE ACTUALLY PRESENT IN AN END-USER +# INSTALLATION ON WINDOWS. +# +# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# import base64 import gzip import json diff --git a/plugins/inara.py b/plugins/inara.py index 08b3b86d..2446693a 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -1,5 +1,27 @@ """Inara Sync.""" +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# +# This is an EDMC 'core' plugin. +# +# All EDMC plugins are *dynamically* loaded at run-time. +# +# We build for Windows using `py2exe`. +# +# `py2exe` can't possibly know about anything in the dynamically loaded +# core plugins. +# +# Thus you **MUST** check if any imports you add in this file are only +# referenced in this file (or only in any other core plugin), and if so... +# +# YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN `setup.py` +# SO AS TO ENSURE THE FILES ARE ACTUALLY PRESENT IN AN END-USER +# INSTALLATION ON WINDOWS. +# +# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# +# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# import json import threading import time From b108456ae3e6efe3d16ea71aa25783301502190c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 15:26:10 +0000 Subject: [PATCH 346/527] Contributing: Add new section about plugin-only imports --- Contributing.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Contributing.md b/Contributing.md index 100b43ff..4d7fc9fc 100644 --- a/Contributing.md +++ b/Contributing.md @@ -246,6 +246,41 @@ Otherwise, see the [pytest documentation](https://docs.pytest.org/en/stable/cont --- +## Imports used only in core plugins + +Because the 'core' plugins, as with any EDMarketConnector plugin, are only ever +loaded dynamically, not through an explicit `import` statement, there is no +way for `py2exe` to know about them when building the contents of the +`dist.win32` directory. See [docs/Releasing.md](docs/Releasing.md) for more +information about this build process. + +Thus, you **MUST** check if any imports you add in `plugins/*.py` files are only +referenced in that file (or also only in any other core plugin), and if so +**YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN `setup.py` +IN ORDER TO ENSURE THE FILES ARE ACTUALLY PRESENT IN AN END-USER +INSTALLATION ON WINDOWS.** + +An exmaple is that as of 2022-02-01 it was noticed that `plugins/eddn.py` now +uses `util/text.py`, and is the only code to do so. `py2exe` does not detect +this and thus the resulting `dist.win32/library.zip` does not contain the +`util/` directory, let alone the `util/text.py` file. The fix was to update +the appropriate `packages` definition to: + +```python + 'packages': [ + 'sqlite3', # Included for plugins + 'util', # 2022-02-01 only imported in plugins/eddn.py + ], +``` + +Note that in this case it's in `packages` because we want the whole directory +adding. For a single file an extra item in `includes` would suffice. + +Such additions to `setup.py` should not cause any issues if subsequent project +changes cause `py2exe` to automatically pick up the same file(s). + +--- + ## Debugging network sends Rather than risk sending bad data to a remote service, even if only through From 87193b4a510c4f8f4c11012dea74c4b294506a23 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 15:43:42 +0000 Subject: [PATCH 347/527] eddn: Be more paranoid about system name augmentation --- plugins/eddn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index d58eac26..ee8a52dd 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -802,7 +802,12 @@ class EDDN: # If 'SystemName' or 'System' is there, it's directly from a journal event. # If they're not there *and* 'StarSystem' isn't either, then we add the latter. if 'SystemName' not in entry and 'System' not in entry and 'StarSystem' not in entry: - entry['StarSystem'] = system_name + if system_name is not None and system_name != '': + entry['StarSystem'] = system_name + + else: + # Bad assumptions if this is the case + logger.error(f'No system name in entry, and system_name was not set either! entry:\n{entry!r}\n') if 'SystemAddress' not in entry: if this.systemaddress is None: From 67019e91b258c0342573f77a23cfdeeeb81f885a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 16:11:35 +0000 Subject: [PATCH 348/527] eddn: Extra System (name) augmentation paranoia --- plugins/eddn.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index ee8a52dd..5eefc46a 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -802,12 +802,13 @@ class EDDN: # If 'SystemName' or 'System' is there, it's directly from a journal event. # If they're not there *and* 'StarSystem' isn't either, then we add the latter. if 'SystemName' not in entry and 'System' not in entry and 'StarSystem' not in entry: - if system_name is not None and system_name != '': - entry['StarSystem'] = system_name + if system_name is None or not isinstance(system_name, str) or system_name == '': + # Bad assumptions if this is the case + logger.warning(f'No system name in entry, and system_name was not set either! entry:\n{entry!r}\n') + return "passed-in system_name is empty, can't add System" else: - # Bad assumptions if this is the case - logger.error(f'No system name in entry, and system_name was not set either! entry:\n{entry!r}\n') + entry['StarSystem'] = system_name if 'SystemAddress' not in entry: if this.systemaddress is None: From f144c199ae4e8f2088023b878860d1f6bc08b56c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 16:12:05 +0000 Subject: [PATCH 349/527] eddn: Be paranoid about Status.json BodyName value --- plugins/eddn.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 5eefc46a..95317c3c 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1596,10 +1596,12 @@ def dashboard_entry(cmdr: str, is_beta: bool, entry: Dict[str, Any]) -> None: :param is_beta: Whether non-live game version was detected. :param entry: The latest Status.json data. """ + this.status_body_name = None if 'BodyName' in entry: - this.status_body_name = entry['BodyName'] + if not isinstance(entry['BodyName'], str): + logger.warning(f'BodyName was present but not a string! "{entry["BodyName"]}"') - else: - this.status_body_name = None + else: + this.status_body_name = entry['BodyName'] tracking_ui_update() From e2e34674c26dc6c0b88e997ac849f5b88d8df5d4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 16:22:12 +0000 Subject: [PATCH 350/527] eddn: codexentry - add paranoia post-processing check of values --- plugins/eddn.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 95317c3c..7cfda84b 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -951,6 +951,10 @@ class EDDN: entry['BodyID'] = this.body_id ####################################################################### + for k, v in entry.items(): + if v is None or isinstance(v, str) and v == '': + logger.warning(f'post-processing entry contains entry["{k}"] = {v}]') + msg = { '$schemaRef': f'https://eddn.edcd.io/schemas/codexentry/1{"/test" if is_beta else ""}', 'message': entry From 4fa64eec40b17a3e356ab091ee1ce40e6f04658f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 16:43:19 +0000 Subject: [PATCH 351/527] eddn: warnings improvements * Log the type of unexpected values. * Say 'falsey' not 'None' when we only `if not ...` --- plugins/eddn.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 7cfda84b..ea80404f 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -895,7 +895,7 @@ class EDDN: this.eddn.export_journal_entry(cmdr, entry, msg) return None - def export_journal_codexentry( + def export_journal_codexentry( # noqa: CCR001 self, cmdr: str, is_beta: bool, entry: MutableMapping[str, Any] ) -> Optional[str]: """ @@ -948,12 +948,16 @@ class EDDN: # Only set BodyID if journal BodyName matches the Status.json one. # This avoids binary body issues. if this.status_body_name == this.body_name: - entry['BodyID'] = this.body_id + if this.body_id is not None and isinstance(this.body_id, int): + entry['BodyID'] = this.body_id + + else: + logger.warning(f'this.body_id was not set properly: "{this.body_id}" ({type(this.body_id)})') ####################################################################### for k, v in entry.items(): if v is None or isinstance(v, str) and v == '': - logger.warning(f'post-processing entry contains entry["{k}"] = {v}]') + logger.warning(f'post-processing entry contains entry["{k}"] = {v} {(type(v))}') msg = { '$schemaRef': f'https://eddn.edcd.io/schemas/codexentry/1{"/test" if is_beta else ""}', @@ -1423,14 +1427,14 @@ def journal_entry( # noqa: C901, CCR001 # add mandatory StarSystem, StarPos and SystemAddress properties to Scan events if 'StarSystem' not in entry: if not system: - logger.warning("system is None, can't add StarSystem") + logger.warning("system is falsey, can't add StarSystem") return "system is None, can't add StarSystem" entry['StarSystem'] = system if 'StarPos' not in entry: if not this.coordinates: - logger.warning("this.coordinates is None, can't add StarPos") + logger.warning("this.coordinates is falsey, can't add StarPos") return "this.coordinates is None, can't add StarPos" # Gazelle[TD] reported seeing a lagged Scan event with incorrect @@ -1443,7 +1447,7 @@ def journal_entry( # noqa: C901, CCR001 if 'SystemAddress' not in entry: if not this.systemaddress: - logger.warning("this.systemaddress is None, can't add SystemAddress") + logger.warning("this.systemaddress is falsey, can't add SystemAddress") return "this.systemaddress is None, can't add SystemAddress" entry['SystemAddress'] = this.systemaddress @@ -1603,7 +1607,7 @@ def dashboard_entry(cmdr: str, is_beta: bool, entry: Dict[str, Any]) -> None: this.status_body_name = None if 'BodyName' in entry: if not isinstance(entry['BodyName'], str): - logger.warning(f'BodyName was present but not a string! "{entry["BodyName"]}"') + logger.warning(f'BodyName was present but not a string! "{entry["BodyName"]}" ({type(entry["BodyName"])})') else: this.status_body_name = entry['BodyName'] From 2bf70aae14bbea7ff2876ad6c474e9e2091f59fe Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 16:59:44 +0000 Subject: [PATCH 352/527] eddn: Be paranoid about this.status_body_name type and value As it was we'd blindly set codexentry['BodyName'] from it if not None. --- plugins/eddn.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index ea80404f..39c28eb5 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -943,7 +943,11 @@ class EDDN: entry = ret # Set BodyName if it's available from Status.json - if this.status_body_name is not None: + if this.status_body_name is None or not isinstance(this.status_body_name, str): + logger.warning(f'this.status_body_name was not set properly:' + f' "{this.status_body_name}" ({type(this.status_body_name)})') + + else: entry['BodyName'] = this.status_body_name # Only set BodyID if journal BodyName matches the Status.json one. # This avoids binary body issues. From 45b78f55c4e888fef1e4562f1880f3ce5cefdb74 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 1 Feb 2022 18:05:28 +0000 Subject: [PATCH 353/527] eddn: say 'is falsey' in error messages as well --- plugins/eddn.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 39c28eb5..5e4f5749 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1432,14 +1432,14 @@ def journal_entry( # noqa: C901, CCR001 if 'StarSystem' not in entry: if not system: logger.warning("system is falsey, can't add StarSystem") - return "system is None, can't add StarSystem" + return "system is falsey, can't add StarSystem" entry['StarSystem'] = system if 'StarPos' not in entry: if not this.coordinates: logger.warning("this.coordinates is falsey, can't add StarPos") - return "this.coordinates is None, can't add StarPos" + return "this.coordinates is falsey, can't add StarPos" # Gazelle[TD] reported seeing a lagged Scan event with incorrect # augmented StarPos: @@ -1452,7 +1452,7 @@ def journal_entry( # noqa: C901, CCR001 if 'SystemAddress' not in entry: if not this.systemaddress: logger.warning("this.systemaddress is falsey, can't add SystemAddress") - return "this.systemaddress is None, can't add SystemAddress" + return "this.systemaddress is falsey, can't add SystemAddress" entry['SystemAddress'] = this.systemaddress From ed4437b20b23744f6c80832e2ce3cf86651d4de1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 17:06:14 +0000 Subject: [PATCH 354/527] build(deps-dev): bump coverage[toml] from 6.3 to 6.3.1 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.3 to 6.3.1. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.3...6.3.1) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3d9976a9..d40a05c7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -35,7 +35,7 @@ py2exe==0.11.0.1; sys_platform == 'win32' # Testing pytest==6.2.5 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.3 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.3.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==303; sys_platform == 'win32' From 19a7bf0bd1877deed465d51bbe7a7a86b0405c18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 17:06:17 +0000 Subject: [PATCH 355/527] build(deps-dev): bump grip from 4.5.2 to 4.6.0 Bumps [grip](https://github.com/joeyespo/grip) from 4.5.2 to 4.6.0. - [Release notes](https://github.com/joeyespo/grip/releases) - [Changelog](https://github.com/joeyespo/grip/blob/master/CHANGES.md) - [Commits](https://github.com/joeyespo/grip/compare/v4.5.2...v4.6.0) --- updated-dependencies: - dependency-name: grip dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3d9976a9..25d11e40 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -24,7 +24,7 @@ types-requests==2.27.8 autopep8==1.6.0 # HTML changelogs -grip==4.5.2 +grip==4.6.0 # Packaging # Used to put together a WiX configuration from template/auto-gen From 1bb48ed5960aef0951df0291b0cfeea9f7cd519e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 3 Feb 2022 13:59:52 +0000 Subject: [PATCH 356/527] eddn/codexentry: Bail and show error if empty string in message --- plugins/eddn.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 5e4f5749..afab0458 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -962,6 +962,10 @@ class EDDN: for k, v in entry.items(): if v is None or isinstance(v, str) and v == '': logger.warning(f'post-processing entry contains entry["{k}"] = {v} {(type(v))}') + # We should drop this message and VERY LOUDLY inform the + # user, in the hopes they'll open a bug report with the + # raw Journal event that caused this. + return 'CodexEntry had empty string, PLEASE ALERT THE EDMC DEVELOPERS' msg = { '$schemaRef': f'https://eddn.edcd.io/schemas/codexentry/1{"/test" if is_beta else ""}', From d83a1c514d15899f0752abcbd55a45c38aa2f133 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 3 Feb 2022 15:33:34 +0000 Subject: [PATCH 357/527] eddn: Log if a 'location' event doesn't have SystemAddress It *really* shouldn't ever happen, and we'll want to see the full event if it does somehow. --- plugins/eddn.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index d58eac26..2f54d609 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1337,7 +1337,14 @@ def journal_entry( # noqa: C901, CCR001 elif this.systemaddress != entry.get('SystemAddress'): this.coordinates = None # Docked event doesn't include coordinates - this.systemaddress = entry.get('SystemAddress') # type: ignore + if 'SystemAddress' not in entry: + logger.warning(f'"location" event without SystemAddress !!!:\n{entry}\n') + + # But we'll still *use* the value, because if a 'location' event doesn't + # have this we've still moved and now don't know where and MUST NOT + # continue to use any old value. + # Yes, explicitly state `None` here, so it's crystal clear. + this.systemaddress = entry.get('SystemAddress', None) # type: ignore elif entry['event'] == 'ApproachBody': this.body_name = entry['Body'] From f8e0fb3658733445e8a98016de639d85c5cf4106 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 4 Feb 2022 12:22:47 +0000 Subject: [PATCH 358/527] monitor: Fold 'EngineerCraft' to lower case in event_type comparison --- monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index 972b2b89..a90397e4 100644 --- a/monitor.py +++ b/monitor.py @@ -1422,7 +1422,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below category = self.category(received['Category']) state_category[received['Material']] += received['Quantity'] - elif event_type == 'EngineerCraft' or ( + elif event_type == 'engineercraft' or ( event_type == 'engineerlegacyconvert' and not entry.get('IsPreview') ): From 8af0f5598b02c1e07af19a46cb17823629ef86d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 17:06:20 +0000 Subject: [PATCH 359/527] build(deps): bump actions/setup-python from 2.3.1 to 2.3.2 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.3.1...v2.3.2) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 7b0a61c2..cbe187a3 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -53,7 +53,7 @@ jobs: # Get Python set up #################################################################### - name: Set up Python 3.10 - uses: actions/setup-python@v2.3.1 + uses: actions/setup-python@v2.3.2 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index e8cf5f5c..100e2363 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python 3.10 - uses: actions/setup-python@v2.3.1 + uses: actions/setup-python@v2.3.2 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 5d12da92..f76bf1b6 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2.3.1 + - uses: actions/setup-python@v2.3.2 with: python-version: "3.10.2" architecture: "x86" From ef963fc949acae5d40303d39ef25767d97000ec6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 17:06:31 +0000 Subject: [PATCH 360/527] build(deps-dev): bump pytest from 6.2.5 to 7.0.0 Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.5 to 7.0.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.5...7.0.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index f1974f58..ba5a4cd2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ lxml==4.7.1 py2exe==0.11.0.1; sys_platform == 'win32' # Testing -pytest==6.2.5 +pytest==7.0.0 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.3.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. From 5a31e5be55252096844a4a3fb4241b7b24dfedf9 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 4 Feb 2022 15:04:37 +0000 Subject: [PATCH 361/527] Pre-Release 5.3.0-beta7: appversion and *first pass* ChangeLog --- ChangeLog.md | 156 +++++++++++++++++++++++++++++++++++++++++++++ config/__init__.py | 2 +- 2 files changed, 157 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 81a9a609..b48ab7e0 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -26,6 +26,162 @@ produce the Windows executables and installer. currently used version in a given branch. --- + +Pre-Release 5.3.0-beta7 +=== + +* We now test and build using Python 3.10.2. We do not *yet* make use of any + features specific to Python 3.10 (or 3.9). Let us restate that we + absolutely reserve the right to commence doing so. + +* All communication with remote web servers and APIs now uses the same custom + "User-Agent" header to make attribution to this application clear. +* The process used to build the Windows installers should now always pick up + all the necessary files automatically. Prior to this we used a manual + process to update the installer configuration which was prone to both user + error and neglecting to update it as necessary. +* We now include [FDevIDS](https://github.com/EDCD/FDevIDs) as a + sub-repository, and use its files directly for keeping some game data up to + date. This should hopefully mean we include, e.g. new ships and modules + for loadout exports in a more timely manner. +* We now use UTC-based timestamps in the application's log files. Prior to + this change it was the "local time", but without any indication of the + applied timezone. Each line's timestamp has ` UTC` as a suffix now, and we + are assuming that your local clock is correct *and* the timezone is set + correctly such that Python's `time.gmtime()` yields UTC times. + + This should make it easier to correlate application logfiles with in-game + time and/or third-party service timestamps. +* Running `EDMarketConnector.exe --reset-ui` will now also reset any changes to + the application "UI Scale" or geometry (position and size). +* Inara: Use the `->Statistics->Bank_Account->Current_Wealth` + value when sending a `setCommanderCredits` message to Inara to set + `commanderAssets`. + + This should cause Inara and EDMC to agree on the Commander's current total + assets credits figure, and thus prevent it bouncing between two values. +* Inara: Send a `setCommanderRankPilot` message when the player logs in to the + game on-foot. Previously you would *HAVE* to be in a ship at login time + for this to be sent. + + Thus, you can now relog on-foot in order to update Inara with any Rank up + or progress since the session started. +* "File" -> "Status" will now show the new Odyssey ranks, both the new + categories and the new 'prestige' ranks, e.g. 'Elite I'. +* If the application fails to load valid data from the `NavRoute.json` file + when processing a Journal `NavRoute` event, it will attempt to retry this + operation a number of times as it processes subsequent Journal events. + + This should hopefully work around a race condition where the game might + not have yet updated `NavRoute.json` at all, or has truncated it to empty, + when we first attempt this. + + We will also now *NOT* attempt to load `NavRoute.json` during the startup + 'Journal catch-up' mode, which only sets internal state. + +* EDDN: We now compress all outgoing messages. This might help get some + particularly large `navroute` messages go through. + + If any message is now rejected as 'too large' we will drop it, and thus + not retry it later. The application logs will reflect this. + + NB: The EDDN Gateway was updated to allow messages up to 1 MiB in size + anyway. The old limit was 100 KiB. + +* Inara: We will now send the new idea of "credits in the Commander's wallet" + when the delta from the last sent value is either 5% *or* at least + 10 million. It used to require a strict 5% difference, which meant needing + very large deltas if you had a large credit balance. + + The intention of the 5% is so that newer/poorer commanders still get + updates at an acceptable frequency, with the 10 million alternative trigger + allowing richer commanders to also experience more frequent updates than + was previously the case. + +* EDDN: In an attempt to diagnose some errors observed on the EDDN Gateway + with respect to messages sent from this application some additional checks + and logging have been added. + + **NB: After some thorough investigation it was concluded that these EDDN + errors were likely the result of long-delayed messages due to use of + the "Delay sending until docked" option.** + + There should be no functional changes for users. But if you see any of + the following in this application's log files **PLEASE OPEN + [AN ISSUE ON GITHUB](https://github.com/EDCD/EDMarketConnector/issues/new?assignees=&labels=bug%2C+unconfirmed&template=bug_report.md&title=) + with all the requested information**, so that we can correct the relevant + code: + + - `No system name in entry, and system_name was not set either! entry: ...` + - `BodyName was present but not a string! ...` + - `post-processing entry contains entry ...` + - `this.body_id was not set properly: ...` + - `system is falsey, can't add StarSystem` + - `this.coordinates is falsey, can't add StarPos` + - `this.systemaddress is falsey, can't add SystemAddress` + - `this.status_body_name was not set properly: ...` + + You might also see any of the following in the application status text + (bottom of the window): + + - `passed-in system_name is empty, can't add System` + - `CodexEntry had empty string, PLEASE ALERT THE EDMC DEVELOPERS` + - `system is falsey, can't add StarSystem` + - `this.coordinates is falsey, can't add StarPos` + - `this.systemaddress is falsey, can't add SystemAddress` + +* Inara: You should once more see updates for any materials used in + Engineering. The bug was in our more general Journal event processing + code, such that the state passed to the Inara plugin hadn't been updated. + + Such updates should happen 'immediately', but take into account that there + can be a delay of up to 35 seconds for any data sent to Inara, due to how + we avoid breaking the "2 messages a minute" limit on the Inara API. + + + +Plugin Developers +--- + +* We now have an `.editorconfig` file which will instruct your editor/IDE to + change some settings pertaining to things like indentation and line wrap, + assuming your editor/IDE supports the file. + + See [Contributing.md->Text formatting](Contributing.md#text-formatting). + +* `config.py` has been refactored into a sub-directory, with the per-OS code + split into separate files. There *shouldn't* be any changes necessary to + how you utilise this, e.g. to determine the application version. + +* We will now include in the Windows installer *all* of the files that `py2exe` + places in the build directory. We still do *not* yet include *all* of the + Python 'stdlib', so open an issue on GitHub if something you need is + missing. + +* Due to now using files from the FDevIDs repository the path of, e.g. + `commodity.csv`, in the source has changed. You should never have been + using this application's copy in plugin code anyway as it's not even + packaged in the Windows installer. + +--- +5.3.0-beta2 through 5.3.0-beta6 were used internally, no public pre-releases. + +--- + +Pre-Release 5.3.0-beta2 +=== + +In terms of application functionality this is identical to 5.3.0-beta1. The +only changes are related to the process of building the Windows installer. + +- Ensure we always package all files into the Windows installer. +- Use a different workaround for OneSky (translations website) using "zh-Hans" + for Chinese (Simplified), whereas Windows will call this "zh-CN". This is + in-code and documented with a comment, as opposed to some 'magic' in the + Windows Installer configuration that had no such documentation. It's less + fragile than relying on that, or developers using a script/documented + process to rename the file. + Pre-Release 5.3.0-beta1 === diff --git a/config/__init__.py b/config/__init__.py index 0ad38b97..fa8f1776 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta6' +_static_appversion = '5.3.0-beta7' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From b96019586943887cc196f99a742fee9dff73736d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 4 Feb 2022 15:21:14 +0000 Subject: [PATCH 362/527] Pre-Release 5.3.0-beta7: ChangeLog pass * Python 3.10 in more places. * Re-ordered entries, both into 'Plugin Developers' section, and grouping for e.g. Inara, EDDN, "obvious users thing", "less obvious user things". * Linked to issues where relevant. --- ChangeLog.md | 114 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 42 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index b48ab7e0..32ccf915 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -13,7 +13,7 @@ produce the Windows executables and installer. **As a consequence of this we no longer support Windows 7. This is due to - [Python 3.9.x itself not supporting Windows 7](https://www.python.org/downloads/windows/). + [Python 3.10.x itself not supporting Windows 7](https://www.python.org/downloads/windows/). The application (both EDMarketConnector.exe and EDMC.exe) will crash on startup due to a missing DLL.** @@ -34,40 +34,31 @@ Pre-Release 5.3.0-beta7 features specific to Python 3.10 (or 3.9). Let us restate that we absolutely reserve the right to commence doing so. +* "File" -> "Status" will now show the new Odyssey ranks, both the new + categories and the new 'prestige' ranks, e.g. 'Elite I'. Closes + [#1369](https://github.com/EDCD/EDMarketConnector/issues/1369). + +* We now use UTC-based timestamps in the application's log files. Prior to + this change it was the "local time", but without any indication of the + applied timezone. Each line's timestamp has ` UTC` as a suffix now, and we + are assuming that your local clock is correct *and* the timezone is set + correctly such that Python's `time.gmtime()` yields UTC times. + + This should make it easier to correlate application logfiles with in-game + time and/or third-party service timestamps. + * All communication with remote web servers and APIs now uses the same custom "User-Agent" header to make attribution to this application clear. + * The process used to build the Windows installers should now always pick up all the necessary files automatically. Prior to this we used a manual process to update the installer configuration which was prone to both user error and neglecting to update it as necessary. -* We now include [FDevIDS](https://github.com/EDCD/FDevIDs) as a - sub-repository, and use its files directly for keeping some game data up to - date. This should hopefully mean we include, e.g. new ships and modules - for loadout exports in a more timely manner. -* We now use UTC-based timestamps in the application's log files. Prior to - this change it was the "local time", but without any indication of the - applied timezone. Each line's timestamp has ` UTC` as a suffix now, and we - are assuming that your local clock is correct *and* the timezone is set - correctly such that Python's `time.gmtime()` yields UTC times. - This should make it easier to correlate application logfiles with in-game - time and/or third-party service timestamps. * Running `EDMarketConnector.exe --reset-ui` will now also reset any changes to - the application "UI Scale" or geometry (position and size). -* Inara: Use the `->Statistics->Bank_Account->Current_Wealth` - value when sending a `setCommanderCredits` message to Inara to set - `commanderAssets`. + the application "UI Scale" or geometry (position and size). Closes + [#1155](https://github.com/EDCD/EDMarketConnector/issues/1155). - This should cause Inara and EDMC to agree on the Commander's current total - assets credits figure, and thus prevent it bouncing between two values. -* Inara: Send a `setCommanderRankPilot` message when the player logs in to the - game on-foot. Previously you would *HAVE* to be in a ship at login time - for this to be sent. - - Thus, you can now relog on-foot in order to update Inara with any Rank up - or progress since the session started. -* "File" -> "Status" will now show the new Odyssey ranks, both the new - categories and the new 'prestige' ranks, e.g. 'Elite I'. * If the application fails to load valid data from the `NavRoute.json` file when processing a Journal `NavRoute` event, it will attempt to retry this operation a number of times as it processes subsequent Journal events. @@ -79,14 +70,24 @@ Pre-Release 5.3.0-beta7 We will also now *NOT* attempt to load `NavRoute.json` during the startup 'Journal catch-up' mode, which only sets internal state. -* EDDN: We now compress all outgoing messages. This might help get some - particularly large `navroute` messages go through. + Closes [#1348](https://github.com/EDCD/EDMarketConnector/issues/1155). - If any message is now rejected as 'too large' we will drop it, and thus - not retry it later. The application logs will reflect this. +* Inara: Use the `->Statistics->Bank_Account->Current_Wealth` + value when sending a `setCommanderCredits` message to Inara to set + `commanderAssets`. - NB: The EDDN Gateway was updated to allow messages up to 1 MiB in size - anyway. The old limit was 100 KiB. + This should cause Inara and EDMC to agree on the Commander's current total + assets credits figure, and thus prevent it bouncing between two values. + + Closes [#1401](https://github.com/EDCD/EDMarketConnector/issues/1401). +* Inara: Send a `setCommanderRankPilot` message when the player logs in to the + game on-foot. Previously you would *HAVE* to be in a ship at login time + for this to be sent. + + Thus, you can now relog on-foot in order to update Inara with any Rank up + or progress since the session started. + + Closes [#1378](https://github.com/EDCD/EDMarketConnector/issues/1378). * Inara: We will now send the new idea of "credits in the Commander's wallet" when the delta from the last sent value is either 5% *or* at least @@ -98,6 +99,30 @@ Pre-Release 5.3.0-beta7 allowing richer commanders to also experience more frequent updates than was previously the case. + Close [#1255](https://github.com/EDCD/EDMarketConnector/issues/1255). + +* Inara: You should once more see updates for any materials used in + Engineering. The bug was in our more general Journal event processing + code pertaining to `EngineerCraft` events, such that the state passed to + the Inara plugin hadn't been updated. + + Such updates should happen 'immediately', but take into account that there + can be a delay of up to 35 seconds for any data sent to Inara, due to how + we avoid breaking the "2 messages a minute" limit on the Inara API. + + Closes [#1395](https://github.com/EDCD/EDMarketConnector/issues/1395). + +* EDDN: We now compress all outgoing messages. This might help get some + particularly large `navroute` messages go through. + + If any message is now rejected as 'too large' we will drop it, and thus + not retry it later. The application logs will reflect this. + + NB: The EDDN Gateway was updated to allow messages up to 1 MiB in size + anyway. The old limit was 100 KiB. + + Closes [#1390](https://github.com/EDCD/EDMarketConnector/issues/1390). + * EDDN: In an attempt to diagnose some errors observed on the EDDN Gateway with respect to messages sent from this application some additional checks and logging have been added. @@ -130,15 +155,8 @@ Pre-Release 5.3.0-beta7 - `this.coordinates is falsey, can't add StarPos` - `this.systemaddress is falsey, can't add SystemAddress` -* Inara: You should once more see updates for any materials used in - Engineering. The bug was in our more general Journal event processing - code, such that the state passed to the Inara plugin hadn't been updated. - - Such updates should happen 'immediately', but take into account that there - can be a delay of up to 35 seconds for any data sent to Inara, due to how - we avoid breaking the "2 messages a minute" limit on the Inara API. - - + Ref: [#1403](https://github.com/EDCD/EDMarketConnector/issues/1403) + [#1393](https://github.com/EDCD/EDMarketConnector/issues/1393). Plugin Developers --- @@ -149,10 +167,22 @@ Plugin Developers See [Contributing.md->Text formatting](Contributing.md#text-formatting). +* As noted above, prior to this version we weren't properly monitoring + `EngineerCraft` events. This caused the `state` passed to plugins to not + contain the correct 'materials' (Raw, Manufactured, Encoded) counts. + * `config.py` has been refactored into a sub-directory, with the per-OS code split into separate files. There *shouldn't* be any changes necessary to how you utilise this, e.g. to determine the application version. + All forms of any `import` statement that worked before should have + unchanged functionality. + +* We now include [FDevIDS](https://github.com/EDCD/FDevIDs) as a + sub-repository, and use its files directly for keeping some game data up to + date. This should hopefully mean we include, e.g. new ships and modules + for loadout exports in a more timely manner. + * We will now include in the Windows installer *all* of the files that `py2exe` places in the build directory. We still do *not* yet include *all* of the Python 'stdlib', so open an issue on GitHub if something you need is @@ -164,7 +194,7 @@ Plugin Developers packaged in the Windows installer. --- -5.3.0-beta2 through 5.3.0-beta6 were used internally, no public pre-releases. +5.3.0-beta3 through 5.3.0-beta6 were used internally, no public pre-releases. --- From edf0393e88062a60e20ea50f6b3d27e768b3c962 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 4 Feb 2022 19:36:52 +0000 Subject: [PATCH 363/527] Pre-Release 5.3.0-beta7: Some ChangeLog review/cleanup --- ChangeLog.md | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 32ccf915..a752e9b7 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -38,11 +38,15 @@ Pre-Release 5.3.0-beta7 categories and the new 'prestige' ranks, e.g. 'Elite I'. Closes [#1369](https://github.com/EDCD/EDMarketConnector/issues/1369). +* Running `EDMarketConnector.exe --reset-ui` will now also reset any changes to + the application "UI Scale" or geometry (position and size). Closes + [#1155](https://github.com/EDCD/EDMarketConnector/issues/1155). + * We now use UTC-based timestamps in the application's log files. Prior to this change it was the "local time", but without any indication of the - applied timezone. Each line's timestamp has ` UTC` as a suffix now, and we + applied timezone. Each line's timestamp has ` UTC` as a suffix now. We are assuming that your local clock is correct *and* the timezone is set - correctly such that Python's `time.gmtime()` yields UTC times. + correctly, such that Python's `time.gmtime()` yields UTC times. This should make it easier to correlate application logfiles with in-game time and/or third-party service timestamps. @@ -55,10 +59,6 @@ Pre-Release 5.3.0-beta7 process to update the installer configuration which was prone to both user error and neglecting to update it as necessary. -* Running `EDMarketConnector.exe --reset-ui` will now also reset any changes to - the application "UI Scale" or geometry (position and size). Closes - [#1155](https://github.com/EDCD/EDMarketConnector/issues/1155). - * If the application fails to load valid data from the `NavRoute.json` file when processing a Journal `NavRoute` event, it will attempt to retry this operation a number of times as it processes subsequent Journal events. @@ -183,16 +183,14 @@ Plugin Developers date. This should hopefully mean we include, e.g. new ships and modules for loadout exports in a more timely manner. + Developers of third-party plugins should never have been using these files + anyway, so this shouldn't break anything for them. + * We will now include in the Windows installer *all* of the files that `py2exe` places in the build directory. We still do *not* yet include *all* of the Python 'stdlib', so open an issue on GitHub if something you need is missing. -* Due to now using files from the FDevIDs repository the path of, e.g. - `commodity.csv`, in the source has changed. You should never have been - using this application's copy in plugin code anyway as it's not even - packaged in the Windows installer. - --- 5.3.0-beta3 through 5.3.0-beta6 were used internally, no public pre-releases. From 8f9bfe9035e25b1c4f559e41d290cb4badb7ab38 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 5 Feb 2022 09:33:08 +0000 Subject: [PATCH 364/527] Pre-Release 5.3.0-beta7: Built on Ath's machine & maleware false positives --- ChangeLog.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index a752e9b7..caea7f67 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -30,6 +30,18 @@ produce the Windows executables and installer. Pre-Release 5.3.0-beta7 === +**NB: Due to [this issue with GitHub's Actions](https://github.com/actions/virtual-environments/issues/5023) +we were unable to build this version on GitHub. THE INSTALLER FOR THIS +RELEASE WAS BUILT ON A DEVELOPER'S OWN MACHINE. THERE IS NO REASON TO BELIEVE +THAT THIS IN ANY WAY INCREASES THE RISK OF IT ACTUALLY CONTAINING MALWARE.** + +As has sadly become routine now, please read +[our statement about malware false positives](https://github.com/EDCD/EDMarketConnector/wiki/Troubleshooting#installer-and-or-executables-flagged-as-malicious-viruses) +affecting our installers and/or the files they contain. We are as confident +as we can be, without detailed auditing of python.org's releases and all of +the py2exe source and releases, that there is no malware in the files we make +available. + * We now test and build using Python 3.10.2. We do not *yet* make use of any features specific to Python 3.10 (or 3.9). Let us restate that we absolutely reserve the right to commence doing so. From 33cfd8427494027de24657b7a308beb2aaf50277 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 09:46:35 +0000 Subject: [PATCH 365/527] windows-build: Try checkout out submodules recursively --- .github/workflows/windows-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index f76bf1b6..09dcbf52 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -21,6 +21,7 @@ jobs: with: python-version: "3.10.2" architecture: "x86" + submodules: recursive - name: Install python tools run: | From f93b4b57d1586970031678d40a711699e56ab28e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 09:48:28 +0000 Subject: [PATCH 366/527] Pre-Release 5.3.0-beta8: appversion and ChangeLog stub --- ChangeLog.md | 8 ++++++++ config/__init__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index caea7f67..5571c852 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,14 @@ produce the Windows executables and installer. --- +Pre-Release 5.3.0-beta8 +=== + +This release is simply to check we've correctly updated the windows-build +configuration to pull in `FDevIDs` when the build is performed on GitHub. + +--- + Pre-Release 5.3.0-beta7 === diff --git a/config/__init__.py b/config/__init__.py index fa8f1776..5221aa61 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta7' +_static_appversion = '5.3.0-beta8' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From b7cc75723cad6c6f275d820a2f7924b271700653 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 11:08:26 +0000 Subject: [PATCH 367/527] windows-build: move `submodules: recursive` to actions/checkout --- .github/workflows/windows-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 09dcbf52..7830a88f 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -17,11 +17,12 @@ jobs: steps: - uses: actions/checkout@v2.4.0 + submodules: recursive + - uses: actions/setup-python@v2.3.2 with: python-version: "3.10.2" architecture: "x86" - submodules: recursive - name: Install python tools run: | From 49275d46b1571de2c4ae86ee2e09c98e41a0171a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 11:13:51 +0000 Subject: [PATCH 368/527] windows-build: Prehaps *this* is the syntax for submodule ? --- .github/workflows/windows-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 7830a88f..e4fece7a 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -17,9 +17,9 @@ jobs: steps: - uses: actions/checkout@v2.4.0 - submodules: recursive - - uses: actions/setup-python@v2.3.2 + with: + submodules: true with: python-version: "3.10.2" architecture: "x86" From 4b9d1b4f936e210e85feda97aa5b712dde50970b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 11:20:09 +0000 Subject: [PATCH 369/527] windows-build: OK, only one `with:`, so try `submodules` first ? If this doesn't work then it's time to try splitting all of this out into separate jobs, rather than steps within a job, with dependencies to ensure it works. --- .github/workflows/windows-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index e4fece7a..89a086ba 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -20,7 +20,6 @@ jobs: - uses: actions/setup-python@v2.3.2 with: submodules: true - with: python-version: "3.10.2" architecture: "x86" From 9fcb479955c3f45be68431743bdcad39c5499090 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 11:43:21 +0000 Subject: [PATCH 370/527] windows-build: Example of how to use separate jobs Example only because I realised this probably won't preserve, e.g. the checkout, python dependencies, winsparkle unpack etc, across jobs. Even if the jobs are serialised by `needs`. So expect this to get reverted next, it's only for reference. --- .github/workflows/windows-build.yml | 64 +++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 16 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 89a086ba..bdfa44c2 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -7,47 +7,79 @@ on: workflow_dispatch: jobs: - test: - name: Build EDMC + checkout_all: + name: Checkout EDMC and submodules runs-on: windows-2019 + steps: + - uses: actions/checkout@v2.4.0 + with: + submodules: true + + python_setup_base: + name: Install python base + runs-on: windows-2019 + needs: checkout_all + + steps: + - uses: actions/setup-python@v2.3.2 + with: + python-version: "3.10.2" + architecture: "x86" + + python_requirements: + name: Install application python requirements + runs-on: windows-2019 + needs: setup_python_base + + steps: + - name: Install python tools + run: | + pip install wheel + pip install -r requirements-dev.txt + + winsparkle_install: + name: Download and unpack WinSparkle files + runs-on: windows-2019 + needs: perform_checkouts + defaults: run: shell: powershell steps: - - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2.3.2 - with: - submodules: true - python-version: "3.10.2" - architecture: "x86" - - - name: Install python tools - run: | - pip install wheel - pip install -r requirements-dev.txt - - name: Download winsparkle run: | Invoke-Webrequest -UseBasicParsing https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip -OutFile out.zip Expand-Archive out.zip Move-Item 'out\WinSparkle-0.7.0\Release\*' '.\' + edmc_setup_py2exe: + name: Invoke setup.py py2exe + runs-on: windows-2019 + needs: [ perform_checkouts, setup_python_base, python_requirements, winsparkle_install ] + + steps: - name: Build EDMC run: | python setup.py py2exe + edmc_upload_build: + name: Upload resulting build files + runs-on: windows-2019 + needs: edmc_setup_py2exe + + steps: - name: Upload build files uses: actions/upload-artifact@v2 with: name: Built files path: EDMarketConnector_win*.msi - release: + edmc_release: name: Release new version runs-on: ubuntu-latest - needs: test + needs: edmc_upload_build if: "${{ github.event_name != 'workflow_dispatch' }}" steps: From ba8b1b08f66ed37435c87b7fb5147336a2c7126c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 11:44:37 +0000 Subject: [PATCH 371/527] Revert "windows-build: Example of how to use separate jobs" This reverts commit 9fcb479955c3f45be68431743bdcad39c5499090. --- .github/workflows/windows-build.yml | 64 ++++++++--------------------- 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index bdfa44c2..89a086ba 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -7,79 +7,47 @@ on: workflow_dispatch: jobs: - checkout_all: - name: Checkout EDMC and submodules + test: + name: Build EDMC runs-on: windows-2019 - steps: - - uses: actions/checkout@v2.4.0 - with: - submodules: true - - python_setup_base: - name: Install python base - runs-on: windows-2019 - needs: checkout_all - - steps: - - uses: actions/setup-python@v2.3.2 - with: - python-version: "3.10.2" - architecture: "x86" - - python_requirements: - name: Install application python requirements - runs-on: windows-2019 - needs: setup_python_base - - steps: - - name: Install python tools - run: | - pip install wheel - pip install -r requirements-dev.txt - - winsparkle_install: - name: Download and unpack WinSparkle files - runs-on: windows-2019 - needs: perform_checkouts - defaults: run: shell: powershell steps: + - uses: actions/checkout@v2.4.0 + - uses: actions/setup-python@v2.3.2 + with: + submodules: true + python-version: "3.10.2" + architecture: "x86" + + - name: Install python tools + run: | + pip install wheel + pip install -r requirements-dev.txt + - name: Download winsparkle run: | Invoke-Webrequest -UseBasicParsing https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip -OutFile out.zip Expand-Archive out.zip Move-Item 'out\WinSparkle-0.7.0\Release\*' '.\' - edmc_setup_py2exe: - name: Invoke setup.py py2exe - runs-on: windows-2019 - needs: [ perform_checkouts, setup_python_base, python_requirements, winsparkle_install ] - - steps: - name: Build EDMC run: | python setup.py py2exe - edmc_upload_build: - name: Upload resulting build files - runs-on: windows-2019 - needs: edmc_setup_py2exe - - steps: - name: Upload build files uses: actions/upload-artifact@v2 with: name: Built files path: EDMarketConnector_win*.msi - edmc_release: + release: name: Release new version runs-on: ubuntu-latest - needs: edmc_upload_build + needs: test if: "${{ github.event_name != 'workflow_dispatch' }}" steps: From 9603eb5561493076e9504621e14d52ccf5207042 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 11:46:24 +0000 Subject: [PATCH 372/527] windows-build: Try the checkout in its own `uses` section --- .github/workflows/windows-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 89a086ba..9aaea7e6 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -17,9 +17,11 @@ jobs: steps: - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2.3.2 with: submodules: true + + - uses: actions/setup-python@v2.3.2 + with: python-version: "3.10.2" architecture: "x86" From 9f0faad041b69ba4665487b696f0c897af7887f4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 12:02:47 +0000 Subject: [PATCH 373/527] develop: Bump appversion --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 5221aa61..f7161cea 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta8' +_static_appversion = '5.3.0-beta9' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 2bf199f1292b2644425ac9a5c08df07f3b6d6b17 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 14:45:00 +0000 Subject: [PATCH 374/527] github: Add `submodule-updates` workflow It's time to start tracking `master/head` of coriolis-data, and this should trigger a PR making that so. --- .github/workflows/submodule-update.yml | 40 ++++++++++++++++++++++++++ coriolis-data | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/submodule-update.yml diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml new file mode 100644 index 00000000..385544cb --- /dev/null +++ b/.github/workflows/submodule-update.yml @@ -0,0 +1,40 @@ +--- +name: Submodule Updates + +on: + # We might want this on a schedule once this is in `main` + push: + branches: [ develop ] + +############### +# Set the Job # +############### +jobs: + check_submodules: + name: Pull Request for updated submodules + runs-on: ubuntu-latest + env: + PARENT_REPOSITORY: 'edcd/edmarketconnector' + CHECKOUT_BRANCH: 'develop' + PR_AGAINST_BRANCH: 'develop' + OWNER: 'edcd' + + steps: + ########################## + # Checkout the code base # + ########################## + - name: Checkout EDMC + uses: actions/checkout@v2 + + #################################### + # Run the action against code base # + #################################### + - name: Check FDevIDs submodule + id: run_action + uses: releasehub-com/github-action-create-pr-parent-submodule@v1 + with: + github_token: ${{ secrets.RELEASE_HUB_SECRET }} + parent_repository: ${{ env.PARENT_REPOSITORY }} + checkout_branch: ${{ env.CHECKOUT_BRANCH}} + pr_against_branch: ${{ env.PR_AGAINST_BRANCH }} + owner: ${{ env.OWNER }} diff --git a/coriolis-data b/coriolis-data index e499f684..5ac8a247 160000 --- a/coriolis-data +++ b/coriolis-data @@ -1 +1 @@ -Subproject commit e499f68469bb4c3d7cecbc91ab67bd4a0bc40993 +Subproject commit 5ac8a2474e931bbf7cae351f7c987bc40af81012 From a77618f76256a023b41ea5ac64126803a8d40001 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 14:46:53 +0000 Subject: [PATCH 375/527] github: Fix org(/repo) case in submodule-updates.yml --- .github/workflows/submodule-update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 385544cb..071b8239 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -14,10 +14,10 @@ jobs: name: Pull Request for updated submodules runs-on: ubuntu-latest env: - PARENT_REPOSITORY: 'edcd/edmarketconnector' + PARENT_REPOSITORY: 'EDCD/EDMarketConnector' CHECKOUT_BRANCH: 'develop' PR_AGAINST_BRANCH: 'develop' - OWNER: 'edcd' + OWNER: 'EDCD' steps: ########################## From 3a362d6a1005c28ba933e6b1eed08b0f5c18acc1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 15:18:45 +0000 Subject: [PATCH 376/527] github: submodules-check: Use GITHUB_SECRET Perhaps this will be sufficient, if not we'll need to tweak the permissions *for that token* **for this action**. --- .github/workflows/submodule-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 071b8239..c757f1f9 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -33,7 +33,7 @@ jobs: id: run_action uses: releasehub-com/github-action-create-pr-parent-submodule@v1 with: - github_token: ${{ secrets.RELEASE_HUB_SECRET }} + github_token: ${{ secrets.GITHUB_TOKEN }} parent_repository: ${{ env.PARENT_REPOSITORY }} checkout_branch: ${{ env.CHECKOUT_BRANCH}} pr_against_branch: ${{ env.PR_AGAINST_BRANCH }} From 25123c32caba2dfa104d2e80dd21d0cc9e49d73a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 7 Feb 2022 15:19:49 +0000 Subject: [PATCH 377/527] updating submodules --- FDevIDs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FDevIDs b/FDevIDs index f4677fff..9ca62008 160000 --- a/FDevIDs +++ b/FDevIDs @@ -1 +1 @@ -Subproject commit f4677fffe618439e4111b97154c4592fe4f360e9 +Subproject commit 9ca62008e93a98dd146bf37cb1e94f2f6c5d2fbf From c93df877bb602b41d3dd7efa5e9b8f9fca13ce5e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 15:25:16 +0000 Subject: [PATCH 378/527] github: submodules-update: Actually it's all submodules, not only FDevIDs --- .github/workflows/submodule-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index c757f1f9..3db7ff60 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -29,7 +29,7 @@ jobs: #################################### # Run the action against code base # #################################### - - name: Check FDevIDs submodule + - name: Check EDMC submodules id: run_action uses: releasehub-com/github-action-create-pr-parent-submodule@v1 with: From 6963a24728ba3aed0b02eedb5c2e2c332de9679f Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 16:09:45 +0000 Subject: [PATCH 379/527] github: submodules-update: Port in all the releasehub code & tweak We want to *check* if there are any changes and only make a branch and add commits if so. The upstream code has no option for this, so use it as a starting point instead. Specifically this is based on: https://github.com/releasehub-com/github-action-create-pr-parent-submodule/blob/main/action.yml aff9d0978a9bbcbc2961d621d5b108c4b46db5e7 * We need 'success' from the *step* to be when there ARE changes, and that is in the special github output. * In order for the whole job *not* to fail in the 'step check_for_changes says it failed' case we need it to have `continue-on-error: true`. --- .github/workflows/submodule-update.yml | 82 +++++++++++++++++++------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 3db7ff60..ecd14e27 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -6,9 +6,6 @@ on: push: branches: [ develop ] -############### -# Set the Job # -############### jobs: check_submodules: name: Pull Request for updated submodules @@ -20,21 +17,66 @@ jobs: OWNER: 'EDCD' steps: - ########################## - # Checkout the code base # - ########################## - - name: Checkout EDMC - uses: actions/checkout@v2 - - #################################### - # Run the action against code base # - #################################### - - name: Check EDMC submodules - id: run_action - uses: releasehub-com/github-action-create-pr-parent-submodule@v1 + - uses: actions/checkout@v2.4.0 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - parent_repository: ${{ env.PARENT_REPOSITORY }} - checkout_branch: ${{ env.CHECKOUT_BRANCH}} - pr_against_branch: ${{ env.PR_AGAINST_BRANCH }} - owner: ${{ env.OWNER }} + submodules: true + + - name: Update submodules + shell: bash + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git submodule update --remote + + - name: Check for changes + id: check_for_changes + continue-on-error: true + run: | + changes=$(git status --porcelain) + if [ -n "${changes}" ]; + then + echo '::set-output changes=true' + fi + echo '::set-output changes=false' + exit 0 + + - name: Create submodules changes branch + if: steps.check_for_changes.outputs.changes == 'true' + run: | + git checkout -b $GITHUB_RUN_ID + git commit -am "updating submodules" + git push --set-upstream origin $GITHUB_RUN_ID + + - name: Create pull request against target branch + if: steps.check_for_changes.outputs.changes == 'true' + uses: actions/github-script@v5 + with: + github-token: ${{ inputs.github_token }} + script: | + await github.rest.pulls.create({ + owner: '${{ inputs.owner }}', + repo: '${{ inputs.parent_repository }}'.split('/')[1].trim(), + head: process.env.GITHUB_RUN_ID, + base: '${{ inputs.pr_against_branch }}', + title: `[Auto-generated] Submodule Updates ${process.env.GITHUB_RUN_ID}`, + body: `[Auto-generated] Submodule Updates ${process.env.GITHUB_RUN_ID}`, + }); + + - name: Add labels + if: steps.check_for_changes.outputs.changes == 'true' + uses: actions/github-script@v5 + with: + github-token: ${{ inputs.github_token }} + script: | + const res = await github.rest.issues.listForRepo({ + owner: '${{ inputs.owner }}', + repo: '${{ inputs.parent_repository }}'.split('/')[1].trim(), + }); + const pr = res.data.filter(i => i.title.includes(process.env.GITHUB_RUN_ID)); + const prNumber = pr[0].number; + await github.rest.issues.addLabels({ + issue_number: prNumber, + owner: '${{ inputs.owner }}', + repo: '${{ inputs.parent_repository }}'.split('/')[1].trim(), + labels: ['${{ inputs.label }}'] + }); From 0cb9f10bff3631b7bf60c2c8d2d572bd6dd299f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 17:38:38 +0000 Subject: [PATCH 380/527] build(deps): bump semantic-version from 2.8.5 to 2.9.0 Bumps [semantic-version](https://github.com/rbarrois/python-semanticversion) from 2.8.5 to 2.9.0. - [Release notes](https://github.com/rbarrois/python-semanticversion/releases) - [Changelog](https://github.com/rbarrois/python-semanticversion/blob/master/ChangeLog) - [Commits](https://github.com/rbarrois/python-semanticversion/compare/2.8.5...2.9.0) --- updated-dependencies: - dependency-name: semantic-version dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 479425c9..402c5a86 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ watchdog==2.1.6 infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep # pyyaml==5.3.1 watchdog dep -semantic-version==2.8.5 +semantic-version==2.9.0 # Base requirement for MacOS pyobjc; sys_platform == 'darwin' From 5e475023849bc3bada495bc42f7c61c9b9871da1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 7 Feb 2022 20:41:47 +0000 Subject: [PATCH 381/527] pre-commit: Updated versions & include `check-yaml` now --- .pre-commit-config.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a6effa3b..bc2d8a73 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,12 +2,13 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 'v3.4.0' + rev: 'v4.1.0' hooks: - id: check-merge-conflict - id: debug-statements - id: end-of-file-fixer - id: mixed-line-ending + - id: check-yaml #- repo: https://github.com/pre-commit/mirrors-autopep8 # rev: '' @@ -30,7 +31,7 @@ repos: types: [ python ] - repo: https://github.com/pre-commit/pygrep-hooks - rev: 'v1.8.0' + rev: 'v1.9.0' hooks: - id: python-no-eval - id: python-no-log-warn @@ -40,7 +41,7 @@ repos: # mypy - static type checking # mypy --follow-imports skip - repo: https://github.com/pre-commit/mirrors-mypy - rev: 'v0.812' + rev: 'v0.931' hooks: - id: mypy args: [ "--follow-imports", "skip", "--ignore-missing-imports", "--scripts-are-modules" ] @@ -59,7 +60,7 @@ repos: # safety.exe check -r requirements.txt - repo: https://github.com/Lucas-C/pre-commit-hooks-safety - rev: 'v1.2.1' + rev: 'v1.2.3' hooks: - id: python-safety-dependencies-check entry: safety From 22f90e23aac7203f9a6a7b9349a163cd68fbc5f7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 8 Feb 2022 13:30:10 +0000 Subject: [PATCH 382/527] Inara: Trigger off 'Progress' for sending setCommanderRankPilot Doing so from 'Rank' means the 'Progress' event hadn't happened yet, so of course we only ever sent all zeroes for progress. NB: Journal-v32 doc makes *no guarantee* about the order of the events. Is it worth trying to be paranoid about that ? For a 100% new player everything would be "all zeroes", so we would likely need to tweak things to store `None` as default values, and check for such. --- plugins/inara.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/inara.py b/plugins/inara.py index 2446693a..e0e0dade 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -519,7 +519,7 @@ def journal_entry( # noqa: C901, CCR001 new_add_event('setCommanderShipLoadout', entry['timestamp'], this.loadout) # Login-time Ranks - elif event_name == 'Rank': + elif event_name == 'Progress': # Send rank info to Inara on startup new_add_event( 'setCommanderRankPilot', From 30e9abb870658f7821e9d7c671cad4f00f033dec Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 8 Feb 2022 13:34:03 +0000 Subject: [PATCH 383/527] Inara: Change the comment for why we're using Progress, not Ranks --- plugins/inara.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/inara.py b/plugins/inara.py index e0e0dade..9388d5da 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -518,7 +518,8 @@ def journal_entry( # noqa: C901, CCR001 this.loadout = make_loadout(state) new_add_event('setCommanderShipLoadout', entry['timestamp'], this.loadout) - # Login-time Ranks + # Trigger off the "only observed as being after Ranks" event so that + # we have both current Ranks *and* current Progress within them. elif event_name == 'Progress': # Send rank info to Inara on startup new_add_event( From dec51c844a1cc07e8cd425e55f3026e95f769d16 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 8 Feb 2022 14:42:31 +0000 Subject: [PATCH 384/527] Pre-Release 5.3.0-beta9: ChangeLog * appversion was already -beta9 in `develop` --- ChangeLog.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 5571c852..dc1b4c17 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,13 @@ produce the Windows executables and installer. --- +Pre-Release 5.3.0-beta9 +=== + +* Inara: Fix for always sending a Rank Progress of 0%. + +--- + Pre-Release 5.3.0-beta8 === From e1ef4f38f885d241cf625cbfb2fd6854dffb6401 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 8 Feb 2022 16:28:50 +0000 Subject: [PATCH 385/527] requirements.txt: Revert semantic_version to 2.8.5 Ref: https://github.com/EDCD/EDMarketConnector/issues/1447 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 402c5a86..479425c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ watchdog==2.1.6 infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep # pyyaml==5.3.1 watchdog dep -semantic-version==2.9.0 +semantic-version==2.8.5 # Base requirement for MacOS pyobjc; sys_platform == 'darwin' From b6b6f995e2b659a433b77ba51da2dfcc59ca65af Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 8 Feb 2022 16:31:31 +0000 Subject: [PATCH 386/527] Pre-Release 5.3.0-beta10: appversion and changelog --- ChangeLog.md | 9 +++++++++ config/__init__.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index dc1b4c17..74766105 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,15 @@ produce the Windows executables and installer. --- +Pre-Release 5.3.0-beta10 +=== + +* Revert `semantic_version` python module to v2.8.5, as v2.9.0 doesn't get + correctly included by py2exe. This leads to application crash at startup + when using the Windows .exe. + +--- + Pre-Release 5.3.0-beta9 === diff --git a/config/__init__.py b/config/__init__.py index f7161cea..6e97602d 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta9' +_static_appversion = '5.3.0-beta10' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From d59dc18b1b8cdf29227365d1984ad89abcacdd20 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 9 Feb 2022 13:50:42 +0000 Subject: [PATCH 387/527] eddn: make the exclusive nature of 'own schema' events explicit --- plugins/eddn.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index a9f25d57..3ffbbdf7 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1391,16 +1391,16 @@ def journal_entry( # noqa: C901, CCR001 if entry['event'].lower() == 'fssdiscoveryscan': return this.eddn.export_journal_fssdiscoveryscan(cmdr, system, is_beta, entry) - if entry['event'].lower() == 'navbeaconscan': + elif entry['event'].lower() == 'navbeaconscan': return this.eddn.export_journal_navbeaconscan(cmdr, system, is_beta, entry) - if entry['event'].lower() == 'codexentry': + elif entry['event'].lower() == 'codexentry': return this.eddn.export_journal_codexentry(cmdr, is_beta, entry) - if entry['event'].lower() == 'scanbarycentre': + elif entry['event'].lower() == 'scanbarycentre': return this.eddn.export_journal_scanbarycentre(cmdr, is_beta, entry) - if entry['event'].lower() == 'navroute': + elif entry['event'].lower() == 'navroute': return this.eddn.export_journal_navroute(cmdr, is_beta, entry) # Send journal schema events to EDDN, but not when on a crew From 91c36a5b1ab005d542b8ea2da80ecdd739265647 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 9 Feb 2022 14:08:36 +0000 Subject: [PATCH 388/527] eddn: Change to the ".lower() Journal event name once" paradigm Also, whilst the *current* code has the 'augment files' handled last in then if/else tree we shouldn't assume that will always be the case. So, be paranoid and use different variables for the augment-loaded entry and its .lower event_name. 'cos you just know one of us will trip up on it later if there's ever some 'finally' code after that conditional tree. --- plugins/eddn.py | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 3ffbbdf7..9efe2c6a 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1331,6 +1331,7 @@ def journal_entry( # noqa: C901, CCR001 return None entry = new_data + event_name = entry['event'].lower() this.on_foot = state['OnFoot'] @@ -1340,8 +1341,8 @@ def journal_entry( # noqa: C901, CCR001 this.odyssey = entry['odyssey'] = state['Odyssey'] # Track location - if entry['event'] in ('Location', 'FSDJump', 'Docked', 'CarrierJump'): - if entry['event'] in ('Location', 'CarrierJump'): + if event_name in ('location', 'fsdjump', 'docked', 'carrierjump'): + if event_name in ('location', 'carrierjump'): if entry.get('BodyType') == 'Planet': this.body_name = entry.get('Body') this.body_id = entry.get('BodyID') @@ -1349,7 +1350,7 @@ def journal_entry( # noqa: C901, CCR001 else: this.body_name = None - elif entry['event'] == 'FSDJump': + elif event_name == 'fsdjump': this.body_name = None this.body_id = None @@ -1368,11 +1369,11 @@ def journal_entry( # noqa: C901, CCR001 # Yes, explicitly state `None` here, so it's crystal clear. this.systemaddress = entry.get('SystemAddress', None) # type: ignore - elif entry['event'] == 'ApproachBody': + elif event_name == 'approachbody': this.body_name = entry['Body'] this.body_id = entry.get('BodyID') - elif entry['event'] == 'LeaveBody': + elif event_name == 'leavebody': # NB: **NOT** SupercruiseEntry, because we won't get a fresh # ApproachBody if we don't leave Orbital Cruise and land again. # *This* is triggered when you go above Orbital Cruise altitude. @@ -1380,7 +1381,7 @@ def journal_entry( # noqa: C901, CCR001 this.body_name = None this.body_id = None - elif entry['event'] == 'Music': + elif event_name == 'music': if entry['MusicTrack'] == 'MainMenu': this.body_name = None this.body_id = None @@ -1388,24 +1389,25 @@ def journal_entry( # noqa: C901, CCR001 # Events with their own EDDN schema if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: - if entry['event'].lower() == 'fssdiscoveryscan': + + if event_name == 'fssdiscoveryscan': return this.eddn.export_journal_fssdiscoveryscan(cmdr, system, is_beta, entry) - elif entry['event'].lower() == 'navbeaconscan': + elif event_name == 'navbeaconscan': return this.eddn.export_journal_navbeaconscan(cmdr, system, is_beta, entry) - elif entry['event'].lower() == 'codexentry': + elif event_name == 'codexentry': return this.eddn.export_journal_codexentry(cmdr, is_beta, entry) - elif entry['event'].lower() == 'scanbarycentre': + elif event_name == 'scanbarycentre': return this.eddn.export_journal_scanbarycentre(cmdr, is_beta, entry) - elif entry['event'].lower() == 'navroute': + elif event_name == 'navroute': return this.eddn.export_journal_navroute(cmdr, is_beta, entry) # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and - (entry['event'] in ('Location', 'FSDJump', 'Docked', 'Scan', 'SAASignalsFound', 'CarrierJump')) and + (event_name in ('location', 'fsdjump', 'docked', 'scan', 'saasignalsfound', 'carrierjump')) and ('StarPos' in entry or this.coordinates)): # strip out properties disallowed by the schema @@ -1435,7 +1437,7 @@ def journal_entry( # noqa: C901, CCR001 ] # add planet to Docked event for planetary stations if known - if entry['event'] == 'Docked' and this.body_name: + if event_name == 'docked' and this.body_name: entry['Body'] = this.body_name entry['BodyType'] = 'Planet' @@ -1479,7 +1481,7 @@ def journal_entry( # noqa: C901, CCR001 return str(e) elif (config.get_int('output') & config.OUT_MKT_EDDN and not state['Captain'] and - entry['event'] in ('Market', 'Outfitting', 'Shipyard')): + event_name in ('market', 'outfitting', 'shipyard')): # Market.json, Outfitting.json or Shipyard.json to process try: @@ -1494,16 +1496,19 @@ def journal_entry( # noqa: C901, CCR001 path = pathlib.Path(journaldir) / f'{entry["event"]}.json' with path.open('rb') as f: - entry = json.load(f) - entry['odyssey'] = this.odyssey - if entry['event'] == 'Market': - this.eddn.export_journal_commodities(cmdr, is_beta, entry) + # Don't assume we can definitely stomp entry & event_name here + entry_augment = json.load(f) + event_name_augment = entry_augment['event'].lower() + entry_augment['odyssey'] = this.odyssey - elif entry['event'] == 'Outfitting': - this.eddn.export_journal_outfitting(cmdr, is_beta, entry) + if event_name_augment == 'market': + this.eddn.export_journal_commodities(cmdr, is_beta, entry_augment) - elif entry['event'] == 'Shipyard': - this.eddn.export_journal_shipyard(cmdr, is_beta, entry) + elif event_name_augment == 'outfitting': + this.eddn.export_journal_outfitting(cmdr, is_beta, entry_augment) + + elif event_name_augment == 'shipyard': + this.eddn.export_journal_shipyard(cmdr, is_beta, entry_augment) except requests.exceptions.RequestException as e: logger.debug(f'Failed exporting {entry["event"]}', exc_info=e) From 4f0ecb0289c7b119647b7e1f9a2c3d27afa1b470 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 9 Feb 2022 14:48:56 +0000 Subject: [PATCH 389/527] .pre-commit-config: .mypy.ini sets these options --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bc2d8a73..e9b0cc92 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: rev: 'v0.931' hooks: - id: mypy - args: [ "--follow-imports", "skip", "--ignore-missing-imports", "--scripts-are-modules" ] + # args: [ "--follow-imports", "skip", "--ignore-missing-imports", "--scripts-are-modules" ] ### # pydocstyle.exe ### - repo: https://github.com/FalconSocial/pre-commit-mirrors-pep257 From 3a0dbb906a7f39eba572ffb567f1e5ab8b96a791 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 9 Feb 2022 15:01:56 +0000 Subject: [PATCH 390/527] eddn: export_journal_approachsettlement() implementation --- plugins/eddn.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 9efe2c6a..f2185156 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1090,6 +1090,46 @@ class EDDN: this.eddn.export_journal_entry(cmdr, entry, msg) return None + def export_journal_approachsettlement( + self, cmdr: str, is_beta: bool, entry: MutableMapping[str, Any] + ) -> Optional[str]: + """ + Send an ApproachSettlement to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + # { + # "BodyID": 32, + # "BodyName": "Ix 5 a a", + # "Latitude": 17.090912, + # "Longitude": 160.236679, + # "MarketID": 3915738368, + # "Name": "Arnold Defence Base", + # "SystemAddress": 2381282543963, + # "event": "ApproachSettlement", + # "timestamp": "2021-10-14T12:37:54Z" + # } + ####################################################################### + # Augmentations + ####################################################################### + # In this case should add StarSystem and StarPos + ret = this.eddn.entry_augment_system_data(entry, entry['StarSystem']) + if isinstance(ret, str): + return ret + + entry = ret + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/approachsettlement/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -1405,6 +1445,9 @@ def journal_entry( # noqa: C901, CCR001 elif event_name == 'navroute': return this.eddn.export_journal_navroute(cmdr, is_beta, entry) + elif event_name == 'approachsettlement': + return this.eddn.export_journal_approachsettlement(cmdr, is_beta, entry) + # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and (event_name in ('location', 'fsdjump', 'docked', 'scan', 'saasignalsfound', 'carrierjump')) and From f1ba8ee5e1561c2b1d17546ca40d0fa937c37f92 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 9 Feb 2022 16:07:16 +0000 Subject: [PATCH 391/527] eddn: Fix up approachsettlement & adjust other such function signatures 1. We need StarPos (as well as StarSystem) 2. Adding more state tracking in this plugin is misguided. 3. So added it in monitor instead, putting *copies* of data in the monitor.state dictionary. 4. So we reference those, but only available in journal_entry() itself, else we'd need to pass the whole of `state` in. 5. So instead pass in the bits of `state` only when we need them. --- monitor.py | 14 +++++++++-- plugins/eddn.py | 63 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/monitor.py b/monitor.py index a90397e4..9c049429 100644 --- a/monitor.py +++ b/monitor.py @@ -180,6 +180,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below 'SuitLoadouts': {}, 'Taxi': None, # True whenever we are _in_ a taxi. ie, this is reset on Disembark etc. 'Dropship': None, # Best effort as to whether or not the above taxi is a dropship. + 'StarSystem': None, # Best effort name of current system. + 'StarPos': None, # Best effort current system's galaxy position. 'Body': None, 'BodyType': None, @@ -801,13 +803,21 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.state['BodyType'] = None if 'StarPos' in entry: - self.coordinates = tuple(entry['StarPos']) # type: ignore + # Plugins need this as well, so copy in state + self.state['StarPos'] = self.coordinates = tuple(entry['StarPos']) # type: ignore self.systemaddress = entry.get('SystemAddress') self.systempopulation = entry.get('Population') - self.system = 'CQC' if entry['StarSystem'] == 'ProvingGround' else entry['StarSystem'] + if entry['StarSystem'] == 'ProvingGround': + to_set = 'CQC' + + else: + to_set = entry['StarSystem'] + + # EDDN plugin needs this in `state` + self.state['StarSystem'] = self.system = to_set self.station = entry.get('StationName') # May be None # If on foot in-station 'Docked' is false, but we have a diff --git a/plugins/eddn.py b/plugins/eddn.py index f2185156..a630cfd8 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -789,14 +789,15 @@ class EDDN: def entry_augment_system_data( self, entry: MutableMapping[str, Any], - system_name: str + system_name: str, + system_coordinates: list ) -> Union[str, MutableMapping[str, Any]]: """ Augment a journal entry with necessary system data. :param entry: The journal entry to be augmented. :param system_name: Name of current star system. - :param systemname_field_name: Name of journal key for system name. + :param system_coordinates: Coordinates of current star system. :return: The augmented version of entry. """ # If 'SystemName' or 'System' is there, it's directly from a journal event. @@ -818,21 +819,29 @@ class EDDN: entry['SystemAddress'] = this.systemaddress if 'StarPos' not in entry: - if not this.coordinates: - logger.warning("this.coordinates is None, can't add StarPos") - return "this.coordinates is None, can't add StarPos" + # Prefer the passed-in, probably monitor.state version + if system_coordinates is not None: + entry['StarPos'] = system_coordinates - entry['StarPos'] = list(this.coordinates) + # TODO: Deprecate in-plugin tracking + elif this.coordinates is not None: + entry['StarPos'] = list(this.coordinates) + + else: + logger.warning("Neither this_coordinates or this.coordinates set, can't add StarPos") + return 'No source for adding StarPos to approachsettlement/1 !' return entry def export_journal_fssdiscoveryscan( - self, cmdr: str, system: str, is_beta: bool, entry: Mapping[str, Any] + self, cmdr: str, system: str, system_starpos: list, is_beta: bool, entry: Mapping[str, Any] ) -> Optional[str]: """ Send an FSSDiscoveryScan to EDDN on the correct schema. :param cmdr: the commander under which this upload is made + :param system: Name of current star system + :param system_starpos: Coordinates of current star system :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send """ @@ -845,7 +854,7 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - ret = this.eddn.entry_augment_system_data(entry, system) + ret = this.eddn.entry_augment_system_data(entry, system, system_starpos) if isinstance(ret, str): return ret @@ -861,13 +870,14 @@ class EDDN: return None def export_journal_navbeaconscan( - self, cmdr: str, system_name: str, is_beta: bool, entry: Mapping[str, Any] + self, cmdr: str, system_name: str, system_starpos: list, is_beta: bool, entry: Mapping[str, Any] ) -> Optional[str]: """ Send an NavBeaconScan to EDDN on the correct schema. :param cmdr: the commander under which this upload is made :param system_name: Name of the current system. + :param system_starpos: Coordinates of current star system :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send """ @@ -880,7 +890,7 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - ret = this.eddn.entry_augment_system_data(entry, system_name) + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret @@ -896,12 +906,13 @@ class EDDN: return None def export_journal_codexentry( # noqa: CCR001 - self, cmdr: str, is_beta: bool, entry: MutableMapping[str, Any] + self, cmdr: str, system_starpos: list, is_beta: bool, entry: MutableMapping[str, Any] ) -> Optional[str]: """ Send a CodexEntry to EDDN on the correct schema. :param cmdr: the commander under which this upload is made + :param system_starpos: Coordinates of current star system :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send """ @@ -936,7 +947,7 @@ class EDDN: # Augmentations ####################################################################### # General 'system' augmentations - ret = this.eddn.entry_augment_system_data(entry, entry['System']) + ret = this.eddn.entry_augment_system_data(entry, entry['System'], system_starpos) if isinstance(ret, str): return ret @@ -976,12 +987,13 @@ class EDDN: return None def export_journal_scanbarycentre( - self, cmdr: str, is_beta: bool, entry: Mapping[str, Any] + self, cmdr: str, system_starpos: list, is_beta: bool, entry: Mapping[str, Any] ) -> Optional[str]: """ Send a ScanBaryCentre to EDDN on the correct schema. :param cmdr: the commander under which this upload is made + :param system_starpos: Coordinates of current star system :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send """ @@ -1007,7 +1019,7 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - ret = this.eddn.entry_augment_system_data(entry, entry['StarSystem']) + ret = this.eddn.entry_augment_system_data(entry, entry['StarSystem'], system_starpos) if isinstance(ret, str): return ret @@ -1029,6 +1041,7 @@ class EDDN: Send a NavRoute to EDDN on the correct schema. :param cmdr: the commander under which this upload is made + :param system_starpos: Coordinates of current star system :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send """ @@ -1091,12 +1104,14 @@ class EDDN: return None def export_journal_approachsettlement( - self, cmdr: str, is_beta: bool, entry: MutableMapping[str, Any] + self, cmdr: str, system_name: str, system_starpos: list, is_beta: bool, entry: MutableMapping[str, Any] ) -> Optional[str]: """ Send an ApproachSettlement to EDDN on the correct schema. :param cmdr: the commander under which this upload is made + :param system_name: Name of current star system + :param system_starpos: Coordinates of current star system :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send """ @@ -1115,7 +1130,7 @@ class EDDN: # Augmentations ####################################################################### # In this case should add StarSystem and StarPos - ret = this.eddn.entry_augment_system_data(entry, entry['StarSystem']) + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret @@ -1431,22 +1446,28 @@ def journal_entry( # noqa: C901, CCR001 if config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain']: if event_name == 'fssdiscoveryscan': - return this.eddn.export_journal_fssdiscoveryscan(cmdr, system, is_beta, entry) + return this.eddn.export_journal_fssdiscoveryscan(cmdr, system, state['StarPos'], is_beta, entry) elif event_name == 'navbeaconscan': - return this.eddn.export_journal_navbeaconscan(cmdr, system, is_beta, entry) + return this.eddn.export_journal_navbeaconscan(cmdr, system, state['StarPos'], is_beta, entry) elif event_name == 'codexentry': - return this.eddn.export_journal_codexentry(cmdr, is_beta, entry) + return this.eddn.export_journal_codexentry(cmdr, state['StarPos'], is_beta, entry) elif event_name == 'scanbarycentre': - return this.eddn.export_journal_scanbarycentre(cmdr, is_beta, entry) + return this.eddn.export_journal_scanbarycentre(cmdr, state['StarPos'], is_beta, entry) elif event_name == 'navroute': return this.eddn.export_journal_navroute(cmdr, is_beta, entry) elif event_name == 'approachsettlement': - return this.eddn.export_journal_approachsettlement(cmdr, is_beta, entry) + return this.eddn.export_journal_approachsettlement( + cmdr, + state['StarSystem'], + state['StarPos'], + is_beta, + entry + ) # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and From 6f0095e5fe9ae8d1b4e33901e0f5376e2a114e52 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 9 Feb 2022 16:14:15 +0000 Subject: [PATCH 392/527] eddn: Slightly rationalise passed StarSystem * Call it system_name in `export_journal_fssdiscoveryscan()`, as `system` could be amigbuous. * Might as well use `system` passed in to `journal_entry()` when calling `export_journal_approachsettlement()`. --- plugins/eddn.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index a630cfd8..8da1954f 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -834,13 +834,13 @@ class EDDN: return entry def export_journal_fssdiscoveryscan( - self, cmdr: str, system: str, system_starpos: list, is_beta: bool, entry: Mapping[str, Any] + self, cmdr: str, system_name: str, system_starpos: list, is_beta: bool, entry: Mapping[str, Any] ) -> Optional[str]: """ Send an FSSDiscoveryScan to EDDN on the correct schema. :param cmdr: the commander under which this upload is made - :param system: Name of current star system + :param system_name: Name of current star system :param system_starpos: Coordinates of current star system :param is_beta: whether or not we are in beta mode :param entry: the journal entry to send @@ -854,7 +854,7 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - ret = this.eddn.entry_augment_system_data(entry, system, system_starpos) + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret @@ -1463,7 +1463,7 @@ def journal_entry( # noqa: C901, CCR001 elif event_name == 'approachsettlement': return this.eddn.export_journal_approachsettlement( cmdr, - state['StarSystem'], + system, state['StarPos'], is_beta, entry From 2d0fd92ebf4d20ab43d8e319604ba75805ab7bb8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 9 Feb 2022 16:36:22 +0000 Subject: [PATCH 393/527] develop: Bump appversion to 5.3.0-beta11 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 6e97602d..79f88393 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta10' +_static_appversion = '5.3.0-beta11' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 5831426eed4f6a3590eb137be8c4d2fd282fa4d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 17:21:15 +0000 Subject: [PATCH 394/527] build(deps-dev): bump types-requests from 2.27.8 to 2.27.9 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.8 to 2.27.9. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index ba5a4cd2..e98c5953 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,7 +18,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.8 +types-requests==2.27.9 # Code formatting tools autopep8==1.6.0 From 46e914fcec1284cb05096f3984e1186732626540 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 11 Feb 2022 11:57:05 +0000 Subject: [PATCH 395/527] monitor: Revert state['StarSystem'] addition, it's not needed. We pass `monitor.system` in to `journal_entry()` anyway, so it doesn't need to be separately in the passed `state`. --- monitor.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/monitor.py b/monitor.py index 9c049429..b271b0c3 100644 --- a/monitor.py +++ b/monitor.py @@ -180,7 +180,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below 'SuitLoadouts': {}, 'Taxi': None, # True whenever we are _in_ a taxi. ie, this is reset on Disembark etc. 'Dropship': None, # Best effort as to whether or not the above taxi is a dropship. - 'StarSystem': None, # Best effort name of current system. 'StarPos': None, # Best effort current system's galaxy position. 'Body': None, 'BodyType': None, @@ -811,13 +810,10 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.systempopulation = entry.get('Population') if entry['StarSystem'] == 'ProvingGround': - to_set = 'CQC' + self.system = 'CQC' else: - to_set = entry['StarSystem'] - - # EDDN plugin needs this in `state` - self.state['StarSystem'] = self.system = to_set + self.system = entry['StarSystem'] self.station = entry.get('StationName') # May be None # If on foot in-station 'Docked' is false, but we have a From dd6c6fbc3638b79c5183a7a156f0d8a726420926 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 11 Feb 2022 12:20:06 +0000 Subject: [PATCH 396/527] Inara: Do not update credits from CAPI data CAPI only has the Cmdr wallet value (and loan if applicable), without anything for 'total assets'. If we send Inara setCommanderCredits without `commanderAssets` then Inara makes a bad judgement on it and sets an incorrect total assets value. Also: > Do NOT set credits/assets unless you are absolutely sure they are correct. The journals currently doesn't contain crew wage cuts, so credit gains are very probably off for most of the players. Also, please, do not send each minor credits change, as it will spam player's credits log with unusable data and they won't be most likely very happy about it. It may be good to set credits just on the session start, session end and on the big changes or in hourly intervals. So, let's just not. --- plugins/inara.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index 9388d5da..23387c3a 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -1384,26 +1384,8 @@ def cmdr_data(data: CAPIData, is_beta): # noqa: CCR001 this.station_link.update_idletasks() if config.get_int('inara_out') and not is_beta and not this.multicrew and credentials(this.cmdr): - if ( - abs(this.last_credits - data['commander']['credits']) >= - min(abs(this.last_credits * CREDITS_DELTA_MIN_FRACTION), CREDITS_DELTA_MIN_ABSOLUTE) - ): - this.filter_events( - Credentials(this.cmdr, this.FID, str(credentials(this.cmdr))), - lambda e: e.name != 'setCommanderCredits' - ) - - # this.events = [x for x in this.events if x['eventName'] != 'setCommanderCredits'] # Remove any unsent - new_add_event( - 'setCommanderCredits', - data['timestamp'], - { - 'commanderCredits': data['commander']['credits'], - 'commanderLoan': data['commander'].get('debt', 0), - } - ) - - this.last_credits = int(data['commander']['credits']) + # Only here to ensure the conditional is correct for future additions + pass def make_loadout(state: Dict[str, Any]) -> OrderedDictT[str, Any]: # noqa: CCR001 From 67c2077962a54a4ccc014a8b8a9ed113050b765d Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 11 Feb 2022 16:15:24 +0000 Subject: [PATCH 397/527] pre-commit: pre-commit runs mypy *in its own venv* As such it doesn't have access to any extra modules you installed for your program, or manually running `mypy `. So, leverage `additional_dependencies` to list anything that mypy ends up complaining "that's not installed". Ref: plugins\eddn.py:40: error: Library stubs not installed for "requests" (or incompatible with Python 3.10) plugins\eddn.py:40: note: Hint: "python3 -m pip install types-requests" plugins\eddn.py:40: note: (or run "mypy --install-types" to install all missing stub packages) plugins\eddn.py:40: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports Found 1 error in 1 file (checked 1 source file) --- .pre-commit-config.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e9b0cc92..19b21930 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,11 @@ # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks repos: +# This can be used to check how pre-commit is being run +# - repo: meta +# hooks: +# - id: identity + - repo: https://github.com/pre-commit/pre-commit-hooks rev: 'v4.1.0' hooks: @@ -44,6 +49,9 @@ repos: rev: 'v0.931' hooks: - id: mypy + # verbose: true + # log_file: 'pre-commit_mypy.log' + additional_dependencies: [ types-requests ] # args: [ "--follow-imports", "skip", "--ignore-missing-imports", "--scripts-are-modules" ] ### # pydocstyle.exe From a93ee14c0546127a6ade7c252bb5b3521477f419 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 11 Feb 2022 16:17:03 +0000 Subject: [PATCH 398/527] eddn: Implement schema fssallbodiesfound/1 --- plugins/eddn.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 8da1954f..1c3fdc43 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1145,6 +1145,44 @@ class EDDN: this.eddn.export_journal_entry(cmdr, entry, msg) return None + def export_journal_fssallbodiesfound( + self, cmdr: str, system_name: str, system_starpos: list, is_beta: bool, entry: MutableMapping[str, Any] + ) -> Optional[str]: + """ + Send an FSSAllBodiesFound message to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param system_name: Name of current star system + :param system_starpos: Coordinates of current star system + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + # { + # "Count": 3, + # "SystemAddress": 9466778822057, + # "SystemName": "LP 704-74", + # "event": "FSSAllBodiesFound", + # "timestamp": "2022-02-09T18:15:14Z" + # } + ####################################################################### + # Augmentations + ####################################################################### + # In this case should add StarSystem and StarPos + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) + if isinstance(ret, str): + return ret + + entry = ret + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/fssallbodiesfound/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -1469,6 +1507,15 @@ def journal_entry( # noqa: C901, CCR001 entry ) + elif event_name == 'fssallbodiesfound': + return this.eddn.export_journal_fssallbodiesfound( + cmdr, + system, + state['StarPos'], + is_beta, + entry + ) + # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and (event_name in ('location', 'fsdjump', 'docked', 'scan', 'saasignalsfound', 'carrierjump')) and From c57bbe878ac3f982be2c3561c4b651905813d3a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 17:03:46 +0000 Subject: [PATCH 399/527] build(deps): bump actions/github-script from 5 to 6 Bumps [actions/github-script](https://github.com/actions/github-script) from 5 to 6. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/submodule-update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index ecd14e27..09562e1f 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -49,7 +49,7 @@ jobs: - name: Create pull request against target branch if: steps.check_for_changes.outputs.changes == 'true' - uses: actions/github-script@v5 + uses: actions/github-script@v6 with: github-token: ${{ inputs.github_token }} script: | @@ -64,7 +64,7 @@ jobs: - name: Add labels if: steps.check_for_changes.outputs.changes == 'true' - uses: actions/github-script@v5 + uses: actions/github-script@v6 with: github-token: ${{ inputs.github_token }} script: | From 91276aa99c483798c70f83fbcc8754b2ba668c29 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 12 Feb 2022 18:12:17 +0000 Subject: [PATCH 400/527] windows-build: Try out pre-release py2exe w/ semantic_version==2.9.0 --- requirements-dev.txt | 4 +++- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e98c5953..fd8478b8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -30,7 +30,9 @@ grip==4.6.0 # Used to put together a WiX configuration from template/auto-gen lxml==4.7.1 # We only need py2exe on windows. -py2exe==0.11.0.1; sys_platform == 'win32' +# Pre-release version addressing semantic_version 2.9.0+ issues: +# +py2exe==0.11.1.0; sys_platform == 'win32' # Testing pytest==7.0.0 diff --git a/requirements.txt b/requirements.txt index 479425c9..402c5a86 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ watchdog==2.1.6 infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep # pyyaml==5.3.1 watchdog dep -semantic-version==2.8.5 +semantic-version==2.9.0 # Base requirement for MacOS pyobjc; sys_platform == 'darwin' From ac7aefbd3ea2fa61130a4cbb874c639332f58944 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 12 Feb 2022 18:23:47 +0000 Subject: [PATCH 401/527] pre-commit: Fix `safety` invocation For some reason this was complaining about file names being passed in by pre-commit when `requirements-dev.txt` and `requirements.txt` were the two changed files. Explicitly passing them in `files:` config avoids this. --- .pre-commit-config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 19b21930..20a49627 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -72,8 +72,9 @@ repos: hooks: - id: python-safety-dependencies-check entry: safety - args: [check, --bare, -r] + args: [check, --bare, --file] language: system + files: requirements-dev.txt, requirements.txt # Check translation comments are up to date - repo: local From 447908fd0c977793c5048f21707b1ad980dc69c0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 12 Feb 2022 22:37:46 +0000 Subject: [PATCH 402/527] requirements-dev.txt: Start listing setuptools explicitly It turned out that the "fixes semantic_version 2.9.0" version of py2exe then has an issue with infi.systray because I was still using `setuptools==60.6.0`, as that's what was latest when I last did anything to cause its installation in my venv. So, list it explicitly on the latest version, which works with py2exe from , and then dependabot should prod us to keep it up to date. --- requirements-dev.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index fd8478b8..8086867d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,6 +2,11 @@ # Using legacy 'setup.py install' for flake8-annotations-coverage, since package 'wheel' is not installed. wheel +# We can't rely on just picking this up from either the base (not venv), +# or venv-init-time version. Specify here so that dependabot will prod us +# about new versions. +setupttools=60.8.2 + # Static analysis tools flake8==4.0.1 flake8-annotations-coverage==0.0.5 From 8489ceeffc1c468826f9f57267be4f122b2a3b91 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 12 Feb 2022 22:42:18 +0000 Subject: [PATCH 403/527] requirements-dev: Fix setupttools= typos --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8086867d..88f68a80 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setupttools=60.8.2 +setuptools==60.8.2 # Static analysis tools flake8==4.0.1 From 6414f7c48a06cd7250dc02397baf36065a6779db Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 13 Feb 2022 15:01:46 +0000 Subject: [PATCH 404/527] Pre-Release 5.3.0-beta11: ChangeLog (appversion already bumped) --- ChangeLog.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 74766105..2d5edf25 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,32 @@ produce the Windows executables and installer. --- +Pre-Release 5.3.0-beta11 +=== + +* EDND: Implement forthcoming approachsettlement/1 schema. + +* EDND: Implement forthcoming fssallbodiesfound/1 schema. + +* Inara: Only send a `setCommanderCredits` message at game login. Yes, you + will **NEED** to relog to send an updated balance. This is the only way + in which to sanely keep the 'Total Assets' value on Inara from bouncing + around. Refer to [Inara:API:docs:setCommanderCredits](https://inara.cz/inara-api-docs/#event-1). + + Closes [#1401](https://github.com/EDCD/EDMarketConnector/issues/1401). + +Plugin Developers +--- + +* It's unlikely to affect you, but our `requirements-dev.txt` now explicitly + cites a specific version of `setuptools`. This was necessary to ensure we + have a version that works with `py2exe` for the windows build process. + + If anything this will ensure you have a *more up to date* version of + `setuptools` installed. + +--- + Pre-Release 5.3.0-beta10 === @@ -41,6 +67,8 @@ Pre-Release 5.3.0-beta9 * Inara: Fix for always sending a Rank Progress of 0%. + Closes [#1378](https://github.com/EDCD/EDMarketConnector/issues/1378). + --- Pre-Release 5.3.0-beta8 From 893a6b243a04c2b6a1759515d3bba4a43d7bb55a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 13 Feb 2022 15:36:01 +0000 Subject: [PATCH 405/527] develop: Bump appversion --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 79f88393..aef24949 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta11' +_static_appversion = '5.3.0-beta12' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From e6c940e0ca10cd3b948cc49f81e0ab9e6fbfa4cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 17:05:21 +0000 Subject: [PATCH 406/527] build(deps-dev): bump pytest from 7.0.0 to 7.0.1 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.0.0...7.0.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 88f68a80..8ce77998 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -40,7 +40,7 @@ lxml==4.7.1 py2exe==0.11.1.0; sys_platform == 'win32' # Testing -pytest==7.0.0 +pytest==7.0.1 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.3.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. From 63052142c17a672c1fe2f060ad4ead2885b437f6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 14 Feb 2022 17:46:55 +0000 Subject: [PATCH 407/527] ChangeLog: Don't lose the 5.2.4 section --- ChangeLog.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 2d5edf25..c196ec91 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -308,6 +308,22 @@ libraries then you should check it has Python 3.10 wheels available. --- +Release 5.2.4 +=== +This is a *very* minor update that simply imports the latest versions of +data files so that some niche functionality works properly. + +* Update `commodity.csv` and `rare_commodity.csv` from the latest + [EDCD/FDevIDs](https://github.com/EDCD/FDevIDs) versions. This addresses + an issue with export of market data in Trade Dangerous format containing + `OnionHeadC` rather than the correct name, `Onionhead Gamma Strain`, that + Trade Dangerous is expecting. + + This will only have affected Trade Dangerous users who use EDMarketConnector + as a source of market data. + +--- + Release 5.2.3 === From e152372b3a1974c23e1e364f2c2f11a963d7840e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Feb 2022 14:25:26 +0000 Subject: [PATCH 408/527] ChangeLog: Fix 'EDND' tyops --- ChangeLog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index c196ec91..07cf9236 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -30,9 +30,9 @@ produce the Windows executables and installer. Pre-Release 5.3.0-beta11 === -* EDND: Implement forthcoming approachsettlement/1 schema. +* EDDN: Implement forthcoming approachsettlement/1 schema. -* EDND: Implement forthcoming fssallbodiesfound/1 schema. +* EDDN: Implement forthcoming fssallbodiesfound/1 schema. * Inara: Only send a `setCommanderCredits` message at game login. Yes, you will **NEED** to relog to send an updated balance. This is the only way From 25e5ed9c14719cb63407f3753ca6c32603650afd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Feb 2022 15:07:04 +0000 Subject: [PATCH 409/527] setup.py: Explicitly package asyncio and multiprocessing We always did before, certainly in 5.2.4, so we should continue to do so, even though newer python and/or py2exe means they're no longer automatically included in library.zip by py2exe. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 57383fe7..22975678 100755 --- a/setup.py +++ b/setup.py @@ -191,6 +191,8 @@ elif sys.platform == 'win32': 'dist_dir': dist_dir, 'optimize': 2, 'packages': [ + 'asyncio', # No longer auto as of py3.10+py2exe 0.11 + 'multiprocessing', # No longer auto as of py3.10+py2exe 0.11 'sqlite3', # Included for plugins 'util', # 2022-02-01 only imported in plugins/eddn.py ], From 5d685f3f3916f1f5f7e2dee32f2269d66178fd6a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Feb 2022 15:09:39 +0000 Subject: [PATCH 410/527] Release 5.3.0: appversion & ChangeLog --- ChangeLog.md | 241 +++++++++++++++++---------------------------- config/__init__.py | 2 +- 2 files changed, 90 insertions(+), 153 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 07cf9236..ddb3d871 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,101 +27,54 @@ produce the Windows executables and installer. --- -Pre-Release 5.3.0-beta11 +Release 5.3.0 === -* EDDN: Implement forthcoming approachsettlement/1 schema. - -* EDDN: Implement forthcoming fssallbodiesfound/1 schema. - -* Inara: Only send a `setCommanderCredits` message at game login. Yes, you - will **NEED** to relog to send an updated balance. This is the only way - in which to sanely keep the 'Total Assets' value on Inara from bouncing - around. Refer to [Inara:API:docs:setCommanderCredits](https://inara.cz/inara-api-docs/#event-1). - - Closes [#1401](https://github.com/EDCD/EDMarketConnector/issues/1401). - -Plugin Developers ---- - -* It's unlikely to affect you, but our `requirements-dev.txt` now explicitly - cites a specific version of `setuptools`. This was necessary to ensure we - have a version that works with `py2exe` for the windows build process. - - If anything this will ensure you have a *more up to date* version of - `setuptools` installed. - ---- - -Pre-Release 5.3.0-beta10 -=== - -* Revert `semantic_version` python module to v2.8.5, as v2.9.0 doesn't get - correctly included by py2exe. This leads to application crash at startup - when using the Windows .exe. - ---- - -Pre-Release 5.3.0-beta9 -=== - -* Inara: Fix for always sending a Rank Progress of 0%. - - Closes [#1378](https://github.com/EDCD/EDMarketConnector/issues/1378). - ---- - -Pre-Release 5.3.0-beta8 -=== - -This release is simply to check we've correctly updated the windows-build -configuration to pull in `FDevIDs` when the build is performed on GitHub. - ---- - -Pre-Release 5.3.0-beta7 -=== - -**NB: Due to [this issue with GitHub's Actions](https://github.com/actions/virtual-environments/issues/5023) -we were unable to build this version on GitHub. THE INSTALLER FOR THIS -RELEASE WAS BUILT ON A DEVELOPER'S OWN MACHINE. THERE IS NO REASON TO BELIEVE -THAT THIS IN ANY WAY INCREASES THE RISK OF IT ACTUALLY CONTAINING MALWARE.** - As has sadly become routine now, please read [our statement about malware false positives](https://github.com/EDCD/EDMarketConnector/wiki/Troubleshooting#installer-and-or-executables-flagged-as-malicious-viruses) affecting our installers and/or the files they contain. We are as confident -as we can be, without detailed auditing of python.org's releases and all of +as we can be, without detailed auditing of python.org's releases and all the py2exe source and releases, that there is no malware in the files we make available. +This release is primarily aimed at fixing some more egregious bugs, +shortcomings and annoyances with the application. It also adds support for +two additional +[EDDN](https://github.com/EDCD/EDDN/blob/live/README.md) +schemas. + * We now test and build using Python 3.10.2. We do not *yet* make use of any - features specific to Python 3.10 (or 3.9). Let us restate that we - absolutely reserve the right to commence doing so. + features specific to Python 3.10 (or 3.9). Let us restate that we + absolutely reserve the right to commence doing so. + +* We now set a custom User-Agent header in all web requests, i.e. to EDDN, + EDSM and the like. This is of the form: + + `EDCD-EDMarketConnector-` * "File" -> "Status" will now show the new Odyssey ranks, both the new - categories and the new 'prestige' ranks, e.g. 'Elite I'. Closes - [#1369](https://github.com/EDCD/EDMarketConnector/issues/1369). + categories and the new 'prestige' ranks, e.g. 'Elite I'. + + Closes [#1369](https://github.com/EDCD/EDMarketConnector/issues/1369). * Running `EDMarketConnector.exe --reset-ui` will now also reset any changes to - the application "UI Scale" or geometry (position and size). Closes - [#1155](https://github.com/EDCD/EDMarketConnector/issues/1155). + the application "UI Scale" or geometry (position and size). + + Closes [#1155](https://github.com/EDCD/EDMarketConnector/issues/1155). * We now use UTC-based timestamps in the application's log files. Prior to - this change it was the "local time", but without any indication of the - applied timezone. Each line's timestamp has ` UTC` as a suffix now. We - are assuming that your local clock is correct *and* the timezone is set - correctly, such that Python's `time.gmtime()` yields UTC times. + this change it was the "local time", but without any indication of the + applied timezone. Each line's timestamp has ` UTC` as a suffix now. We + are assuming that your local clock is correct *and* the timezone is set + correctly, such that Python's `time.gmtime()` yields UTC times. - This should make it easier to correlate application logfiles with in-game - time and/or third-party service timestamps. - -* All communication with remote web servers and APIs now uses the same custom - "User-Agent" header to make attribution to this application clear. + This should make it easier to correlate application logfiles with in-game + time and/or third-party service timestamps. * The process used to build the Windows installers should now always pick up - all the necessary files automatically. Prior to this we used a manual - process to update the installer configuration which was prone to both user - error and neglecting to update it as necessary. + all the necessary files automatically. Prior to this we used a manual + process to update the installer configuration which was prone to both user + error and neglecting to update it as necessary. * If the application fails to load valid data from the `NavRoute.json` file when processing a Journal `NavRoute` event, it will attempt to retry this @@ -140,10 +93,15 @@ available. value when sending a `setCommanderCredits` message to Inara to set `commanderAssets`. - This should cause Inara and EDMC to agree on the Commander's current total - assets credits figure, and thus prevent it bouncing between two values. + In addition, a `setCommanderCredits` message at game login **will now only + ever be sent at game login**. Yes, you will **NEED** to relog to send an + updated balance. This is the only way in which to sanely keep the + 'Total Assets' value on Inara from bouncing around. + + Refer to [Inara:API:docs:setCommanderCredits](https://inara.cz/inara-api-docs/#event-1). Closes [#1401](https://github.com/EDCD/EDMarketConnector/issues/1401). + * Inara: Send a `setCommanderRankPilot` message when the player logs in to the game on-foot. Previously you would *HAVE* to be in a ship at login time for this to be sent. @@ -153,17 +111,9 @@ available. Closes [#1378](https://github.com/EDCD/EDMarketConnector/issues/1378). -* Inara: We will now send the new idea of "credits in the Commander's wallet" - when the delta from the last sent value is either 5% *or* at least - 10 million. It used to require a strict 5% difference, which meant needing - very large deltas if you had a large credit balance. +* Inara: Fix for always sending a Rank Progress of 0%. - The intention of the 5% is so that newer/poorer commanders still get - updates at an acceptable frequency, with the 10 million alternative trigger - allowing richer commanders to also experience more frequent updates than - was previously the case. - - Close [#1255](https://github.com/EDCD/EDMarketConnector/issues/1255). + Closes [#1378](https://github.com/EDCD/EDMarketConnector/issues/1378). * Inara: You should once more see updates for any materials used in Engineering. The bug was in our more general Journal event processing @@ -176,24 +126,30 @@ available. Closes [#1395](https://github.com/EDCD/EDMarketConnector/issues/1395). +* EDDN: Implement new [approachsettlement/1](https://github.com/EDCD/EDDN/blob/live/schemas/approachsettlement-README.md) + schema. + +* EDDN: Implement new [fssallbodiesfound/1](https://github.com/EDCD/EDDN/blob/live/schemas/fssallbodiesfound-README.md) + schema. + * EDDN: We now compress all outgoing messages. This might help get some - particularly large `navroute` messages go through. + particularly large `navroute` messages go through. - If any message is now rejected as 'too large' we will drop it, and thus - not retry it later. The application logs will reflect this. + If any message is now rejected as 'too large' we will drop it, and thus + not retry it later. The application logs will reflect this. - NB: The EDDN Gateway was updated to allow messages up to 1 MiB in size - anyway. The old limit was 100 KiB. + NB: The EDDN Gateway was updated to allow messages up to 1 MiB in size + anyway. The old limit was 100 KiB. - Closes [#1390](https://github.com/EDCD/EDMarketConnector/issues/1390). + Closes [#1390](https://github.com/EDCD/EDMarketConnector/issues/1390). * EDDN: In an attempt to diagnose some errors observed on the EDDN Gateway with respect to messages sent from this application some additional checks and logging have been added. **NB: After some thorough investigation it was concluded that these EDDN - errors were likely the result of long-delayed messages due to use of - the "Delay sending until docked" option.** + errors were likely the result of long-delayed messages due to use of + the "Delay sending until docked" option.** There should be no functional changes for users. But if you see any of the following in this application's log files **PLEASE OPEN @@ -209,7 +165,7 @@ available. - `this.coordinates is falsey, can't add StarPos` - `this.systemaddress is falsey, can't add SystemAddress` - `this.status_body_name was not set properly: ...` - + You might also see any of the following in the application status text (bottom of the window): @@ -222,9 +178,38 @@ available. Ref: [#1403](https://github.com/EDCD/EDMarketConnector/issues/1403) [#1393](https://github.com/EDCD/EDMarketConnector/issues/1393). +Translations +--- + +* Use a different workaround for OneSky (translations website) using "zh-Hans" + for Chinese (Simplified), whereas Windows will call this "zh-CN". This is + in-code and documented with a comment, as opposed to some 'magic' in the + Windows Installer configuration that had no such documentation. It's less + fragile than relying on that, or developers using a script/documented + process to rename the file. + Plugin Developers --- +We now test against, and package with Python 3.10.2. + +* We've made no explicit changes to the Python stdlib, or other modules, we + currently offer, but we did have to start explicitly including + `asyncio` and `multiprocessing` due to using a newer version of `py2exe` + for the windows build. + +* We will now include in the Windows installer *all* of the files that `py2exe` + places in the build directory. This is vulnerable to a later version of + our code, python and/or py2exe no longer causing inclusion of a module. + + We have endeavoured to ensure this release contains *at least* all of the + same modules that 5.2.4 did. + + We are looking into + [including all of Python stdlib](https://github.com/EDCD/EDMarketConnector/issues/1327), + but if there's a particular part of this we don't package then please ask + us to by opening an issue on GitHub. + * We now have an `.editorconfig` file which will instruct your editor/IDE to change some settings pertaining to things like indentation and line wrap, assuming your editor/IDE supports the file. @@ -250,62 +235,14 @@ Plugin Developers Developers of third-party plugins should never have been using these files anyway, so this shouldn't break anything for them. -* We will now include in the Windows installer *all* of the files that `py2exe` - places in the build directory. We still do *not* yet include *all* of the - Python 'stdlib', so open an issue on GitHub if something you need is - missing. +* It's unlikely to affect you, but our `requirements-dev.txt` now explicitly + cites a specific version of `setuptools`. This was necessary to ensure we + have a version that works with `py2exe` for the windows build process. + + If anything this will ensure you have a *more up to date* version of + `setuptools` installed. --- -5.3.0-beta3 through 5.3.0-beta6 were used internally, no public pre-releases. - ---- - -Pre-Release 5.3.0-beta2 -=== - -In terms of application functionality this is identical to 5.3.0-beta1. The -only changes are related to the process of building the Windows installer. - -- Ensure we always package all files into the Windows installer. -- Use a different workaround for OneSky (translations website) using "zh-Hans" - for Chinese (Simplified), whereas Windows will call this "zh-CN". This is - in-code and documented with a comment, as opposed to some 'magic' in the - Windows Installer configuration that had no such documentation. It's less - fragile than relying on that, or developers using a script/documented - process to rename the file. - -Pre-Release 5.3.0-beta1 -=== - -This is a test release to ensure packaging with Python 3.10.1 is working -correctly. There is also a small change to metadata in any remote web -request we make. - -* We now set a custom User-Agent header in all web requests, i.e. to EDDN, - EDSM and the like. This is of the form: - - `EDCD-EDMarketConnector-` - -Developers ---- - -We now test against, and package with Python 3.10.1. - -We've made no explicit changes to the Python stdlib, or other modules, we -currently offer. However, the newer [py2exe](https://github.com/py2exe/py2exe/) -we now use has decided we no longer need: - - - _aynscio.pyd - - _multiprocessing.pyd - - _overlapped.pyd - -so those are no longer included in the Windows installers. We are looking into -[including all of Python stdlib](https://github.com/EDCD/EDMarketConnector/issues/1327) -so this would be resolved by that. - -If your plugin utilises any module/package that requires per-architecture -libraries then you should check it has Python 3.10 wheels available. - --- Release 5.2.4 diff --git a/config/__init__.py b/config/__init__.py index aef24949..63505dac 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0-beta12' +_static_appversion = '5.3.0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From d13cf73688be21c89a257ef6981406662f80c641 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Feb 2022 15:17:06 +0000 Subject: [PATCH 411/527] l10n: Updated translations from OneSky --- L10n/pl.strings | 3 +++ 1 file changed, 3 insertions(+) diff --git a/L10n/pl.strings b/L10n/pl.strings index 4ac1d33b..6e4f7244 100644 --- a/L10n/pl.strings +++ b/L10n/pl.strings @@ -250,6 +250,9 @@ /* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ "EDDN Error: Returned {STATUS} status code" = "Błąd EDDN: Zwrócono kod {STATUS}"; +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ +"No 'Route' array in NavRoute.json contents" = "Brak tablicy \"Route\" wewnątrz NavRoute.json"; + /* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ "Send station data to the Elite Dangerous Data Network" = "Wyślij dane do Elite Dangerous Data Network"; From e6c342136593b2aabda29898811e43fcbf3d18b1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Feb 2022 15:17:44 +0000 Subject: [PATCH 412/527] Release 5.3.0: ChanegLog: Oops, translations --- ChangeLog.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index ddb3d871..ca5ad793 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -55,6 +55,8 @@ schemas. * "File" -> "Status" will now show the new Odyssey ranks, both the new categories and the new 'prestige' ranks, e.g. 'Elite I'. + **NB: Due to an oversight there are currently no translations for these.** + Closes [#1369](https://github.com/EDCD/EDMarketConnector/issues/1369). * Running `EDMarketConnector.exe --reset-ui` will now also reset any changes to @@ -188,6 +190,11 @@ Translations fragile than relying on that, or developers using a script/documented process to rename the file. +* As noted above we forgot to upload to + [OneSky](https://marginal.oneskyapp.com/collaboration/project/52710) + after adding the Odyssey new ranks/categories. This has now been done, + and some new phrases await translation. + Plugin Developers --- From f0126dd10b5a36481d12220f3188eb176e5319fc Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Feb 2022 15:56:05 +0000 Subject: [PATCH 413/527] Re-remove: *.csv as they're now used from FDevIDs submodule `develop` never got the 5.2.4 updates to the files, and then that causedd a merge conflict into `main`. This is tidying things up. --- commodity.csv | 234 ---------- outfitting.csv | 1069 -------------------------------------------- rare_commodity.csv | 143 ------ 3 files changed, 1446 deletions(-) delete mode 100644 commodity.csv delete mode 100644 outfitting.csv delete mode 100644 rare_commodity.csv diff --git a/commodity.csv b/commodity.csv deleted file mode 100644 index d7af8459..00000000 --- a/commodity.csv +++ /dev/null @@ -1,234 +0,0 @@ -id,symbol,category,name -128049152,Platinum,Metals,Platinum -128049153,Palladium,Metals,Palladium -128049154,Gold,Metals,Gold -128049155,Silver,Metals,Silver -128049156,Bertrandite,Minerals,Bertrandite -128049157,Indite,Minerals,Indite -128049158,Gallite,Minerals,Gallite -128049159,Coltan,Minerals,Coltan -128049160,Uraninite,Minerals,Uraninite -128049161,Lepidolite,Minerals,Lepidolite -128049162,Cobalt,Metals,Cobalt -128049163,Rutile,Minerals,Rutile -128049165,Bauxite,Minerals,Bauxite -128049166,Water,Chemicals,Water -128049168,Beryllium,Metals,Beryllium -128049169,Indium,Metals,Indium -128049170,Gallium,Metals,Gallium -128049171,Tantalum,Metals,Tantalum -128049172,Uranium,Metals,Uranium -128049173,Lithium,Metals,Lithium -128049174,Titanium,Metals,Titanium -128049175,Copper,Metals,Copper -128049176,Aluminium,Metals,Aluminium -128049177,Algae,Foods,Algae -128049178,FruitAndVegetables,Foods,Fruit and Vegetables -128049180,Grain,Foods,Grain -128049182,Animalmeat,Foods,Animal Meat -128049183,Fish,Foods,Fish -128049184,FoodCartridges,Foods,Food Cartridges -128049185,SyntheticMeat,Foods,Synthetic Meat -128049188,Tea,Foods,Tea -128049189,Coffee,Foods,Coffee -128049190,Leather,Textiles,Leather -128049191,NaturalFabrics,Textiles,Natural Fabrics -128049193,SyntheticFabrics,Textiles,Synthetic Fabrics -128049197,Polymers,Industrial Materials,Polymers -128049199,Semiconductors,Industrial Materials,Semiconductors -128049200,Superconductors,Industrial Materials,Superconductors -128049202,HydrogenFuel,Chemicals,Hydrogen Fuel -128049203,MineralOil,Chemicals,Mineral Oil -128049204,Explosives,Chemicals,Explosives -128049205,Pesticides,Chemicals,Pesticides -128049208,AgriculturalMedicines,Medicines,Agri-Medicines -128049209,PerformanceEnhancers,Medicines,Performance Enhancers -128049210,BasicMedicines,Medicines,Basic Medicines -128049212,BasicNarcotics,Legal Drugs,Narcotics -128049213,Tobacco,Legal Drugs,Tobacco -128049214,Beer,Legal Drugs,Beer -128049215,Wine,Legal Drugs,Wine -128049216,Liquor,Legal Drugs,Liquor -128049217,PowerGenerators,Machinery,Power Generators -128049218,WaterPurifiers,Machinery,Water Purifiers -128049220,HeliostaticFurnaces,Machinery,Microbial Furnaces -128049221,MineralExtractors,Machinery,Mineral Extractors -128049222,CropHarvesters,Machinery,Crop Harvesters -128049223,MarineSupplies,Machinery,Marine Equipment -128049225,ComputerComponents,Technology,Computer Components -128049226,HazardousEnvironmentSuits,Technology,H.E. Suits -128049227,Robotics,Technology,Robotics -128049228,AutoFabricators,Technology,Auto-Fabricators -128049229,AnimalMonitors,Technology,Animal Monitors -128049230,AquaponicSystems,Technology,Aquaponic Systems -128049231,AdvancedCatalysers,Technology,Advanced Catalysers -128049232,TerrainEnrichmentSystems,Technology,Land Enrichment Systems -128049233,PersonalWeapons,Weapons,Personal Weapons -128049234,BattleWeapons,Weapons,Battle Weapons -128049235,ReactiveArmour,Weapons,Reactive Armour -128049236,NonLethalWeapons,Weapons,Non-Lethal Weapons -128049238,DomesticAppliances,Consumer Items,Domestic Appliances -128049240,ConsumerTechnology,Consumer Items,Consumer Technology -128049241,Clothing,Consumer Items,Clothing -128049243,Slaves,Slavery,Slaves -128049244,Biowaste,Waste,Biowaste -128049245,ToxicWaste,Waste,Toxic Waste -128049246,ChemicalWaste,Waste,Chemical Waste -128049248,Scrap,Waste,Scrap -128049669,ProgenitorCells,Medicines,Progenitor Cells -128049670,CombatStabilisers,Medicines,Combat Stabilisers -128049671,ResonatingSeparators,Technology,Resonating Separators -128049672,BioReducingLichen,Technology,Bioreducing Lichen -128064028,AtmosphericExtractors,Machinery,Atmospheric Processors -128066403,Drones,NonMarketable,Limpets -128666752,USSCargoBlackBox,Salvage,Black Box -128666754,USSCargoTradeData,Salvage,Trade Data -128666755,USSCargoMilitaryPlans,Salvage,Military Plans -128666756,USSCargoAncientArtefact,Salvage,Ancient Artefact -128666757,USSCargoRareArtwork,Salvage,Rare Artwork -128666758,USSCargoExperimentalChemicals,Salvage,Experimental Chemicals -128666759,USSCargoRebelTransmissions,Salvage,Rebel Transmissions -128666760,USSCargoPrototypeTech,Salvage,Prototype Tech -128666761,USSCargoTechnicalBlueprints,Salvage,Technical Blueprints -128667728,ImperialSlaves,Slavery,Imperial Slaves -128668547,UnknownArtifact,Salvage,Thargoid Sensor -128668548,AiRelics,Salvage,AI Relics -128668549,Hafnium178,Metals,Hafnium 178 -128668550,Painite,Minerals,Painite -128668551,Antiquities,Salvage,Antiquities -128668552,MilitaryIntelligence,Salvage,Military Intelligence -128671118,Osmium,Metals,Osmium -128671443,SAP8CoreContainer,Salvage,SAP 8 Core Container -128671444,TrinketsOfFortune,Consumer Items,Trinkets of Hidden Fortune -128672123,WreckageComponents,Salvage,Wreckage Components -128672124,EncriptedDataStorage,Salvage,Encrypted Data Storage -128672125,OccupiedCryoPod,Salvage,Occupied Escape Pod -128672126,PersonalEffects,Salvage,Personal Effects -128672127,ComercialSamples,Salvage,Commercial Samples -128672128,TacticalData,Salvage,Tactical Data -128672129,AssaultPlans,Salvage,Assault Plans -128672130,EncryptedCorrespondence,Salvage,Encrypted Correspondence -128672131,DiplomaticBag,Salvage,Diplomatic Bag -128672132,ScientificResearch,Salvage,Scientific Research -128672133,ScientificSamples,Salvage,Scientific Samples -128672134,PoliticalPrisoner,Salvage,Political Prisoners -128672135,Hostage,Salvage,Hostages -128672136,LargeExplorationDataCash,Salvage,Large Survey Data Cache -128672137,SmallExplorationDataCash,Salvage,Small Survey Data Cache -128672159,AntiqueJewellery,Salvage,Antique Jewellery -128672160,PreciousGems,Salvage,Precious Gems -128672161,EarthRelics,Salvage,Earth Relics -128672162,GeneBank,Salvage,Gene Bank -128672163,TimeCapsule,Salvage,Time Capsule -128672294,Cryolite,Minerals,Cryolite -128672295,Goslarite,Minerals,Goslarite -128672296,Moissanite,Minerals,Moissanite -128672297,Pyrophyllite,Minerals,Pyrophyllite -128672298,Lanthanum,Metals,Lanthanum -128672299,Thallium,Metals,Thallium -128672300,Bismuth,Metals,Bismuth -128672301,Thorium,Metals,Thorium -128672302,CeramicComposites,Industrial Materials,Ceramic Composites -128672303,SyntheticReagents,Chemicals,Synthetic Reagents -128672304,NerveAgents,Chemicals,Nerve Agents -128672305,SurfaceStabilisers,Chemicals,Surface Stabilisers -128672306,BootlegLiquor,Legal Drugs,Bootleg Liquor -128672307,GeologicalEquipment,Machinery,Geological Equipment -128672308,ThermalCoolingUnits,Machinery,Thermal Cooling Units -128672309,BuildingFabricators,Machinery,Building Fabricators -128672310,MuTomImager,Technology,Muon Imager -128672311,StructuralRegulators,Technology,Structural Regulators -128672312,Landmines,Weapons,Landmines -128672313,SkimerComponents,Machinery,Skimmer Components -128672314,EvacuationShelter,Consumer Items,Evacuation Shelter -128672315,GeologicalSamples,Salvage,Geological Samples -128672701,MetaAlloys,Industrial Materials,Meta-Alloys -128672775,Taaffeite,Minerals,Taaffeite -128672776,Jadeite,Minerals,Jadeite -128672810,UnstableDataCore,Salvage,Unstable Data Core -128672811,DamagedEscapePod,Salvage,Damaged Escape Pod -128673845,Praseodymium,Metals,Praseodymium -128673846,Bromellite,Minerals,Bromellite -128673847,Samarium,Metals,Samarium -128673848,LowTemperatureDiamond,Minerals,Low Temperature Diamonds -128673850,HydrogenPeroxide,Chemicals,Hydrogen Peroxide -128673851,LiquidOxygen,Chemicals,Liquid oxygen -128673852,MethanolMonohydrateCrystals,Minerals,Methanol Monohydrate Crystals -128673853,LithiumHydroxide,Minerals,Lithium Hydroxide -128673854,MethaneClathrate,Minerals,Methane Clathrate -128673855,InsulatingMembrane,Industrial Materials,Insulating Membrane -128673856,CMMComposite,Industrial Materials,CMM Composite -128673857,CoolingHoses,Industrial Materials,Micro-weave Cooling Hoses -128673858,NeofabricInsulation,Industrial Materials,Neofabric Insulation -128673859,ArticulationMotors,Machinery,Articulation Motors -128673860,HNShockMount,Machinery,HN Shock Mount -128673861,EmergencyPowerCells,Machinery,Emergency Power Cells -128673862,PowerConverter,Machinery,Power Converter -128673863,PowerGridAssembly,Machinery,Energy Grid Assembly -128673864,PowerTransferConduits,Machinery,Power Transfer Bus -128673865,RadiationBaffle,Machinery,Radiation Baffle -128673866,ExhaustManifold,Machinery,Exhaust Manifold -128673867,ReinforcedMountingPlate,Machinery,Reinforced Mounting Plate -128673868,HeatsinkInterlink,Machinery,Heatsink Interlink -128673869,MagneticEmitterCoil,Machinery,Magnetic Emitter Coil -128673870,ModularTerminals,Machinery,Modular Terminals -128673871,Nanobreakers,Technology,Nanobreakers -128673872,TelemetrySuite,Technology,Telemetry Suite -128673873,MicroControllers,Technology,Micro Controllers -128673874,IonDistributor,Machinery,Ion Distributor -128673875,DiagnosticSensor,Technology,Hardware Diagnostic Sensor -128673876,UnknownArtifact2,Salvage,Thargoid Probe -128682044,ConductiveFabrics,Textiles,Conductive Fabrics -128682045,MilitaryGradeFabrics,Textiles,Military Grade Fabrics -128682046,AdvancedMedicines,Medicines,Advanced Medicines -128682047,MedicalDiagnosticEquipment,Technology,Medical Diagnostic Equipment -128682048,SurvivalEquipment,Consumer Items,Survival Equipment -128682049,DataCore,Salvage,Data Core -128682051,MysteriousIdol,Salvage,Mysterious Idol -128682052,ProhibitedResearchMaterials,Salvage,Prohibited Research Materials -128682053,AntimatterContainmentUnit,Salvage,Antimatter Containment Unit -128682054,SpacePioneerRelics,Salvage,Space Pioneer Relics -128682055,FossilRemnants,Salvage,Fossil Remnants -128732183,AncientRelic,Salvage,Guardian Relic -128732184,AncientOrb,Salvage,Guardian Orb -128732185,AncientCasket,Salvage,Guardian Casket -128732186,AncientTablet,Salvage,Guardian Tablet -128732187,AncientUrn,Salvage,Guardian Urn -128732188,AncientTotem,Salvage,Guardian Totem -128737287,UnknownResin,Salvage,Thargoid Resin -128737288,UnknownBiologicalMatter,Salvage,Thargoid Biological Matter -128737289,UnknownTechnologySamples,Salvage,Thargoid Technology Samples -128740752,UnknownArtifact3,Salvage,Thargoid Link -128793127,ThargoidHeart,Salvage,Thargoid Heart -128793128,ThargoidTissueSampleType1,Salvage,Thargoid Cyclops Tissue Sample -128793129,ThargoidTissueSampleType2,Salvage,Thargoid Basilisk Tissue Sample -128793130,ThargoidTissueSampleType3,Salvage,Thargoid Medusa Tissue Sample -128824468,ThargoidScoutTissueSample,Salvage,Thargoid Scout Tissue Sample -128888499,AncientKey,Salvage,Ancient Key -128902652,ThargoidTissueSampleType4,Salvage,Thargoid Hydra Tissue Sample -128922517,M_TissueSample_Fluid,Salvage,Mollusc Fluid -128922518,M_TissueSample_Soft,Salvage,Mollusc Soft Tissue -128922519,M_TissueSample_Nerves,Salvage,Mollusc Brain Tissue -128922520,S_TissueSample_Cells,Salvage,Pod Core Tissue -128922521,S_TissueSample_Surface,Salvage,Pod Dead Tissue -128922522,S_TissueSample_Core,Salvage,Pod Surface Tissue -128922523,P_ParticulateSample,Salvage,Anomaly Particles -128922781,S9_TissueSample_Shell,Salvage,Pod Tissue -128922782,M3_TissueSample_Membrane,Salvage,Mollusc Membrane -128922783,M3_TissueSample_Mycelium,Salvage,Mollusc Mycelium -128922784,M3_TissueSample_Spores,Salvage,Mollusc Spores -128922785,S6_TissueSample_Mesoglea,Salvage,Pod Mesoglea -128922786,S6_TissueSample_Cells,Salvage,Pod Outer Tissue -128922787,S6_TissueSample_Coenosarc,Salvage,Pod Shell Tissue -128924325,Rhodplumsite,Minerals,Rhodplumsite -128924326,Serendibite,Minerals,Serendibite -128924327,Monazite,Minerals,Monazite -128924328,Musgravite,Minerals,Musgravite -128924329,Benitoite,Minerals,Benitoite -128924330,Grandidierite,Minerals,Grandidierite -128924331,Alexandrite,Minerals,Alexandrite -128924332,Opal,Minerals,Void Opals -128924333,RockforthFertiliser,Chemicals,Rockforth Fertiliser -128924334,AgronomicTreatment,Chemicals,Agronomic Treatment -128961249,Tritium,Chemicals,Tritium -128983059,OnionHeadC,Legal Drugs,Onionhead Gamma Strain diff --git a/outfitting.csv b/outfitting.csv deleted file mode 100644 index 02955d21..00000000 --- a/outfitting.csv +++ /dev/null @@ -1,1069 +0,0 @@ -id,symbol,category,name,mount,guidance,ship,class,rating,entitlement -128049250,SideWinder_Armour_Grade1,standard,Lightweight Alloy,,,Sidewinder,1,I, -128049251,SideWinder_Armour_Grade2,standard,Reinforced Alloy,,,Sidewinder,1,I, -128049252,SideWinder_Armour_Grade3,standard,Military Grade Composite,,,Sidewinder,1,I, -128049253,SideWinder_Armour_Mirrored,standard,Mirrored Surface Composite,,,Sidewinder,1,I, -128049254,SideWinder_Armour_Reactive,standard,Reactive Surface Composite,,,Sidewinder,1,I, -128049256,Eagle_Armour_Grade1,standard,Lightweight Alloy,,,Eagle,1,I, -128049257,Eagle_Armour_Grade2,standard,Reinforced Alloy,,,Eagle,1,I, -128049258,Eagle_Armour_Grade3,standard,Military Grade Composite,,,Eagle,1,I, -128049259,Eagle_Armour_Mirrored,standard,Mirrored Surface Composite,,,Eagle,1,I, -128049260,Eagle_Armour_Reactive,standard,Reactive Surface Composite,,,Eagle,1,I, -128049262,Hauler_Armour_Grade1,standard,Lightweight Alloy,,,Hauler,1,I, -128049263,Hauler_Armour_Grade2,standard,Reinforced Alloy,,,Hauler,1,I, -128049264,Hauler_Armour_Grade3,standard,Military Grade Composite,,,Hauler,1,I, -128049265,Hauler_Armour_Mirrored,standard,Mirrored Surface Composite,,,Hauler,1,I, -128049266,Hauler_Armour_Reactive,standard,Reactive Surface Composite,,,Hauler,1,I, -128049268,Adder_Armour_Grade1,standard,Lightweight Alloy,,,Adder,1,I, -128049269,Adder_Armour_Grade2,standard,Reinforced Alloy,,,Adder,1,I, -128049270,Adder_Armour_Grade3,standard,Military Grade Composite,,,Adder,1,I, -128049271,Adder_Armour_Mirrored,standard,Mirrored Surface Composite,,,Adder,1,I, -128049272,Adder_Armour_Reactive,standard,Reactive Surface Composite,,,Adder,1,I, -128049274,Viper_Armour_Grade1,standard,Lightweight Alloy,,,Viper MkIII,1,I, -128049275,Viper_Armour_Grade2,standard,Reinforced Alloy,,,Viper MkIII,1,I, -128049276,Viper_Armour_Grade3,standard,Military Grade Composite,,,Viper MkIII,1,I, -128049277,Viper_Armour_Mirrored,standard,Mirrored Surface Composite,,,Viper MkIII,1,I, -128049278,Viper_Armour_Reactive,standard,Reactive Surface Composite,,,Viper MkIII,1,I, -128049280,CobraMkIII_Armour_Grade1,standard,Lightweight Alloy,,,Cobra MkIII,1,I, -128049281,CobraMkIII_Armour_Grade2,standard,Reinforced Alloy,,,Cobra MkIII,1,I, -128049282,CobraMkIII_Armour_Grade3,standard,Military Grade Composite,,,Cobra MkIII,1,I, -128049283,CobraMkIII_Armour_Mirrored,standard,Mirrored Surface Composite,,,Cobra MkIII,1,I, -128049284,CobraMkIII_Armour_Reactive,standard,Reactive Surface Composite,,,Cobra MkIII,1,I, -128049286,Type6_Armour_Grade1,standard,Lightweight Alloy,,,Type-6 Transporter,1,I, -128049287,Type6_Armour_Grade2,standard,Reinforced Alloy,,,Type-6 Transporter,1,I, -128049288,Type6_Armour_Grade3,standard,Military Grade Composite,,,Type-6 Transporter,1,I, -128049289,Type6_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-6 Transporter,1,I, -128049290,Type6_Armour_Reactive,standard,Reactive Surface Composite,,,Type-6 Transporter,1,I, -128049292,Dolphin_Armour_Grade1,standard,Lightweight Alloy,,,Dolphin,1,I, -128049293,Dolphin_Armour_Grade2,standard,Reinforced Alloy,,,Dolphin,1,I, -128049294,Dolphin_Armour_Grade3,standard,Military Grade Composite,,,Dolphin,1,I, -128049295,Dolphin_Armour_Mirrored,standard,Mirrored Surface Composite,,,Dolphin,1,I, -128049296,Dolphin_Armour_Reactive,standard,Reactive Surface Composite,,,Dolphin,1,I, -128049298,Type7_Armour_Grade1,standard,Lightweight Alloy,,,Type-7 Transporter,1,I, -128049299,Type7_Armour_Grade2,standard,Reinforced Alloy,,,Type-7 Transporter,1,I, -128049300,Type7_Armour_Grade3,standard,Military Grade Composite,,,Type-7 Transporter,1,I, -128049301,Type7_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-7 Transporter,1,I, -128049302,Type7_Armour_Reactive,standard,Reactive Surface Composite,,,Type-7 Transporter,1,I, -128049304,Asp_Armour_Grade1,standard,Lightweight Alloy,,,Asp Explorer,1,I, -128049305,Asp_Armour_Grade2,standard,Reinforced Alloy,,,Asp Explorer,1,I, -128049306,Asp_Armour_Grade3,standard,Military Grade Composite,,,Asp Explorer,1,I, -128049307,Asp_Armour_Mirrored,standard,Mirrored Surface Composite,,,Asp Explorer,1,I, -128049308,Asp_Armour_Reactive,standard,Reactive Surface Composite,,,Asp Explorer,1,I, -128049310,Vulture_Armour_Grade1,standard,Lightweight Alloy,,,Vulture,1,I, -128049311,Vulture_Armour_Grade2,standard,Reinforced Alloy,,,Vulture,1,I, -128049312,Vulture_Armour_Grade3,standard,Military Grade Composite,,,Vulture,1,I, -128049313,Vulture_Armour_Mirrored,standard,Mirrored Surface Composite,,,Vulture,1,I, -128049314,Vulture_Armour_Reactive,standard,Reactive Surface Composite,,,Vulture,1,I, -128049316,Empire_Trader_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Clipper,1,I, -128049317,Empire_Trader_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Clipper,1,I, -128049318,Empire_Trader_Armour_Grade3,standard,Military Grade Composite,,,Imperial Clipper,1,I, -128049319,Empire_Trader_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Clipper,1,I, -128049320,Empire_Trader_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Clipper,1,I, -128049322,Federation_Dropship_Armour_Grade1,standard,Lightweight Alloy,,,Federal Dropship,1,I, -128049323,Federation_Dropship_Armour_Grade2,standard,Reinforced Alloy,,,Federal Dropship,1,I, -128049324,Federation_Dropship_Armour_Grade3,standard,Military Grade Composite,,,Federal Dropship,1,I, -128049325,Federation_Dropship_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Dropship,1,I, -128049326,Federation_Dropship_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Dropship,1,I, -128049328,Orca_Armour_Grade1,standard,Lightweight Alloy,,,Orca,1,I, -128049329,Orca_Armour_Grade2,standard,Reinforced Alloy,,,Orca,1,I, -128049330,Orca_Armour_Grade3,standard,Military Grade Composite,,,Orca,1,I, -128049331,Orca_Armour_Mirrored,standard,Mirrored Surface Composite,,,Orca,1,I, -128049332,Orca_Armour_Reactive,standard,Reactive Surface Composite,,,Orca,1,I, -128049334,Type9_Armour_Grade1,standard,Lightweight Alloy,,,Type-9 Heavy,1,I, -128049335,Type9_Armour_Grade2,standard,Reinforced Alloy,,,Type-9 Heavy,1,I, -128049336,Type9_Armour_Grade3,standard,Military Grade Composite,,,Type-9 Heavy,1,I, -128049337,Type9_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-9 Heavy,1,I, -128049338,Type9_Armour_Reactive,standard,Reactive Surface Composite,,,Type-9 Heavy,1,I, -128049340,Python_Armour_Grade1,standard,Lightweight Alloy,,,Python,1,I, -128049341,Python_Armour_Grade2,standard,Reinforced Alloy,,,Python,1,I, -128049342,Python_Armour_Grade3,standard,Military Grade Composite,,,Python,1,I, -128049343,Python_Armour_Mirrored,standard,Mirrored Surface Composite,,,Python,1,I, -128049344,Python_Armour_Reactive,standard,Reactive Surface Composite,,,Python,1,I, -128049346,BelugaLiner_Armour_Grade1,standard,Lightweight Alloy,,,Beluga Liner,1,I, -128049347,BelugaLiner_Armour_Grade2,standard,Reinforced Alloy,,,Beluga Liner,1,I, -128049348,BelugaLiner_Armour_Grade3,standard,Military Grade Composite,,,Beluga Liner,1,I, -128049349,BelugaLiner_Armour_Mirrored,standard,Mirrored Surface Composite,,,Beluga Liner,1,I, -128049350,BelugaLiner_Armour_Reactive,standard,Reactive Surface Composite,,,Beluga Liner,1,I, -128049352,FerDeLance_Armour_Grade1,standard,Lightweight Alloy,,,Fer-de-Lance,1,I, -128049353,FerDeLance_Armour_Grade2,standard,Reinforced Alloy,,,Fer-de-Lance,1,I, -128049354,FerDeLance_Armour_Grade3,standard,Military Grade Composite,,,Fer-de-Lance,1,I, -128049355,FerDeLance_Armour_Mirrored,standard,Mirrored Surface Composite,,,Fer-de-Lance,1,I, -128049356,FerDeLance_Armour_Reactive,standard,Reactive Surface Composite,,,Fer-de-Lance,1,I, -128049364,Anaconda_Armour_Grade1,standard,Lightweight Alloy,,,Anaconda,1,I, -128049365,Anaconda_Armour_Grade2,standard,Reinforced Alloy,,,Anaconda,1,I, -128049366,Anaconda_Armour_Grade3,standard,Military Grade Composite,,,Anaconda,1,I, -128049367,Anaconda_Armour_Mirrored,standard,Mirrored Surface Composite,,,Anaconda,1,I, -128049368,Anaconda_Armour_Reactive,standard,Reactive Surface Composite,,,Anaconda,1,I, -128049370,Federation_Corvette_Armour_Grade1,standard,Lightweight Alloy,,,Federal Corvette,1,I, -128049371,Federation_Corvette_Armour_Grade2,standard,Reinforced Alloy,,,Federal Corvette,1,I, -128049372,Federation_Corvette_Armour_Grade3,standard,Military Grade Composite,,,Federal Corvette,1,I, -128049373,Federation_Corvette_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Corvette,1,I, -128049374,Federation_Corvette_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Corvette,1,I, -128049376,Cutter_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Cutter,1,I, -128049377,Cutter_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Cutter,1,I, -128049378,Cutter_Armour_Grade3,standard,Military Grade Composite,,,Imperial Cutter,1,I, -128049379,Cutter_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Cutter,1,I, -128049380,Cutter_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Cutter,1,I, -128049381,Hpt_PulseLaser_Fixed_Small,hardpoint,Pulse Laser,Fixed,,,1,F, -128049382,Hpt_PulseLaser_Fixed_Medium,hardpoint,Pulse Laser,Fixed,,,2,E, -128049383,Hpt_PulseLaser_Fixed_Large,hardpoint,Pulse Laser,Fixed,,,3,D, -128049384,Hpt_PulseLaser_Fixed_Huge,hardpoint,Pulse Laser,Fixed,,,4,A, -128049385,Hpt_PulseLaser_Gimbal_Small,hardpoint,Pulse Laser,Gimballed,,,1,G, -128049386,Hpt_PulseLaser_Gimbal_Medium,hardpoint,Pulse Laser,Gimballed,,,2,F, -128049387,Hpt_PulseLaser_Gimbal_Large,hardpoint,Pulse Laser,Gimballed,,,3,E, -128049388,Hpt_PulseLaser_Turret_Small,hardpoint,Pulse Laser,Turreted,,,1,G, -128049389,Hpt_PulseLaser_Turret_Medium,hardpoint,Pulse Laser,Turreted,,,2,F, -128049390,Hpt_PulseLaser_Turret_Large,hardpoint,Pulse Laser,Turreted,,,3,F, -128049400,Hpt_PulseLaserBurst_Fixed_Small,hardpoint,Burst Laser,Fixed,,,1,F, -128049401,Hpt_PulseLaserBurst_Fixed_Medium,hardpoint,Burst Laser,Fixed,,,2,E, -128049402,Hpt_PulseLaserBurst_Fixed_Large,hardpoint,Burst Laser,Fixed,,,3,D, -128049403,Hpt_PulseLaserBurst_Fixed_Huge,hardpoint,Burst Laser,Fixed,,,4,E, -128049404,Hpt_PulseLaserBurst_Gimbal_Small,hardpoint,Burst Laser,Gimballed,,,1,G, -128049405,Hpt_PulseLaserBurst_Gimbal_Medium,hardpoint,Burst Laser,Gimballed,,,2,F, -128049406,Hpt_PulseLaserBurst_Gimbal_Large,hardpoint,Burst Laser,Gimballed,,,3,E, -128049407,Hpt_PulseLaserBurst_Turret_Small,hardpoint,Burst Laser,Turreted,,,1,G, -128049408,Hpt_PulseLaserBurst_Turret_Medium,hardpoint,Burst Laser,Turreted,,,2,F, -128049409,Hpt_PulseLaserBurst_Turret_Large,hardpoint,Burst Laser,Turreted,,,3,E, -128049428,Hpt_BeamLaser_Fixed_Small,hardpoint,Beam Laser,Fixed,,,1,E, -128049429,Hpt_BeamLaser_Fixed_Medium,hardpoint,Beam Laser,Fixed,,,2,D, -128049430,Hpt_BeamLaser_Fixed_Large,hardpoint,Beam Laser,Fixed,,,3,C, -128049431,Hpt_BeamLaser_Fixed_Huge,hardpoint,Beam Laser,Fixed,,,4,A, -128049432,Hpt_BeamLaser_Gimbal_Small,hardpoint,Beam Laser,Gimballed,,,1,E, -128049433,Hpt_BeamLaser_Gimbal_Medium,hardpoint,Beam Laser,Gimballed,,,2,D, -128049434,Hpt_BeamLaser_Gimbal_Large,hardpoint,Beam Laser,Gimballed,,,3,C, -128049435,Hpt_BeamLaser_Turret_Small,hardpoint,Beam Laser,Turreted,,,1,F, -128049436,Hpt_BeamLaser_Turret_Medium,hardpoint,Beam Laser,Turreted,,,2,E, -128049437,Hpt_BeamLaser_Turret_Large,hardpoint,Beam Laser,Turreted,,,3,D, -128049438,Hpt_Cannon_Fixed_Small,hardpoint,Cannon,Fixed,,,1,D, -128049439,Hpt_Cannon_Fixed_Medium,hardpoint,Cannon,Fixed,,,2,D, -128049440,Hpt_Cannon_Fixed_Large,hardpoint,Cannon,Fixed,,,3,C, -128049441,Hpt_Cannon_Fixed_Huge,hardpoint,Cannon,Fixed,,,4,B, -128049442,Hpt_Cannon_Gimbal_Small,hardpoint,Cannon,Gimballed,,,1,E, -128049443,Hpt_Cannon_Gimbal_Medium,hardpoint,Cannon,Gimballed,,,2,D, -128049444,Hpt_Cannon_Gimbal_Huge,hardpoint,Cannon,Gimballed,,,4,B, -128049445,Hpt_Cannon_Turret_Small,hardpoint,Cannon,Turreted,,,1,F, -128049446,Hpt_Cannon_Turret_Medium,hardpoint,Cannon,Turreted,,,2,E, -128049447,Hpt_Cannon_Turret_Large,hardpoint,Cannon,Turreted,,,3,D, -128049448,Hpt_Slugshot_Fixed_Small,hardpoint,Fragment Cannon,Fixed,,,1,E, -128049449,Hpt_Slugshot_Fixed_Medium,hardpoint,Fragment Cannon,Fixed,,,2,A, -128049450,Hpt_Slugshot_Fixed_Large,hardpoint,Fragment Cannon,Fixed,,,3,C, -128049451,Hpt_Slugshot_Gimbal_Small,hardpoint,Fragment Cannon,Gimballed,,,1,E, -128049452,Hpt_Slugshot_Gimbal_Medium,hardpoint,Fragment Cannon,Gimballed,,,2,D, -128049453,Hpt_Slugshot_Turret_Small,hardpoint,Fragment Cannon,Turreted,,,1,E, -128049454,Hpt_Slugshot_Turret_Medium,hardpoint,Fragment Cannon,Turreted,,,2,D, -128049455,Hpt_MultiCannon_Fixed_Small,hardpoint,Multi-Cannon,Fixed,,,1,F, -128049456,Hpt_MultiCannon_Fixed_Medium,hardpoint,Multi-Cannon,Fixed,,,2,E, -128049457,Hpt_MultiCannon_Fixed_Large,hardpoint,Multi-Cannon,Fixed,,,3,C, -128049458,Hpt_MultiCannon_Fixed_Huge,hardpoint,Multi-Cannon,Fixed,,,4,A, -128049459,Hpt_MultiCannon_Gimbal_Small,hardpoint,Multi-Cannon,Gimballed,,,1,G, -128049460,Hpt_MultiCannon_Gimbal_Medium,hardpoint,Multi-Cannon,Gimballed,,,2,F, -128049461,Hpt_MultiCannon_Gimbal_Large,hardpoint,Multi-Cannon,Gimballed,,,3,C, -128049462,Hpt_MultiCannon_Turret_Small,hardpoint,Multi-Cannon,Turreted,,,1,G, -128049463,Hpt_MultiCannon_Turret_Medium,hardpoint,Multi-Cannon,Turreted,,,2,F, -128049464,Hpt_MultiCannon_Turret_Large,hardpoint,Multi-Cannon,Turreted,,,3,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128049465,Hpt_PlasmaAccelerator_Fixed_Medium,hardpoint,Plasma Accelerator,Fixed,,,2,C, -128049466,Hpt_PlasmaAccelerator_Fixed_Large,hardpoint,Plasma Accelerator,Fixed,,,3,B, -128049467,Hpt_PlasmaAccelerator_Fixed_Huge,hardpoint,Plasma Accelerator,Fixed,,,4,A, -128049488,Hpt_Railgun_Fixed_Small,hardpoint,Rail Gun,Fixed,,,1,D, -128049489,Hpt_Railgun_Fixed_Medium,hardpoint,Rail Gun,Fixed,,,2,B, -128049492,Hpt_BasicMissileRack_Fixed_Small,hardpoint,Seeker Missile Rack,Fixed,Seeker,,1,B, -128049493,Hpt_BasicMissileRack_Fixed_Medium,hardpoint,Seeker Missile Rack,Fixed,Seeker,,2,B, -128049494,Hpt_BasicMissileRack_Fixed_Large,hardpoint,Seeker Missile Rack,Fixed,Seeker,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128049500,Hpt_MineLauncher_Fixed_Small,hardpoint,Mine Launcher,Fixed,,,1,I, -128049501,Hpt_MineLauncher_Fixed_Medium,hardpoint,Mine Launcher,Fixed,,,2,I, -128049509,Hpt_AdvancedTorpPylon_Fixed_Small,hardpoint,Torpedo Pylon,Fixed,Seeker,,1,I, -128049510,Hpt_AdvancedTorpPylon_Fixed_Medium,hardpoint,Torpedo Pylon,Fixed,Seeker,,2,I, -128049511,Hpt_AdvancedTorpPylon_Fixed_Large,hardpoint,Torpedo Pylon,Fixed,Seeker,,3,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128049513,Hpt_ChaffLauncher_Tiny,utility,Chaff Launcher,,,,0,I, -128049516,Hpt_ElectronicCountermeasure_Tiny,utility,Electronic Countermeasure,,,,0,F, -128049519,Hpt_HeatSinkLauncher_Turret_Tiny,utility,Heat Sink Launcher,,,,0,I, -128049522,Hpt_PlasmaPointDefence_Turret_Tiny,utility,Point Defence,,,,0,I, -128049525,Hpt_MiningLaser_Fixed_Small,hardpoint,Mining Laser,Fixed,,,1,D, -128049526,Hpt_MiningLaser_Fixed_Medium,hardpoint,Mining Laser,Fixed,,,2,D, -128049549,Int_DockingComputer_Standard,internal,Standard Docking Computer,,,,1,E, -128064033,Int_Powerplant_Size2_Class1,standard,Power Plant,,,,2,E, -128064034,Int_Powerplant_Size2_Class2,standard,Power Plant,,,,2,D, -128064035,Int_Powerplant_Size2_Class3,standard,Power Plant,,,,2,C, -128064036,Int_Powerplant_Size2_Class4,standard,Power Plant,,,,2,B, -128064037,Int_Powerplant_Size2_Class5,standard,Power Plant,,,,2,A, -128064038,Int_Powerplant_Size3_Class1,standard,Power Plant,,,,3,E, -128064039,Int_Powerplant_Size3_Class2,standard,Power Plant,,,,3,D, -128064040,Int_Powerplant_Size3_Class3,standard,Power Plant,,,,3,C, -128064041,Int_Powerplant_Size3_Class4,standard,Power Plant,,,,3,B, -128064042,Int_Powerplant_Size3_Class5,standard,Power Plant,,,,3,A, -128064043,Int_Powerplant_Size4_Class1,standard,Power Plant,,,,4,E, -128064044,Int_Powerplant_Size4_Class2,standard,Power Plant,,,,4,D, -128064045,Int_Powerplant_Size4_Class3,standard,Power Plant,,,,4,C, -128064046,Int_Powerplant_Size4_Class4,standard,Power Plant,,,,4,B, -128064047,Int_Powerplant_Size4_Class5,standard,Power Plant,,,,4,A, -128064048,Int_Powerplant_Size5_Class1,standard,Power Plant,,,,5,E, -128064049,Int_Powerplant_Size5_Class2,standard,Power Plant,,,,5,D, -128064050,Int_Powerplant_Size5_Class3,standard,Power Plant,,,,5,C, -128064051,Int_Powerplant_Size5_Class4,standard,Power Plant,,,,5,B, -128064052,Int_Powerplant_Size5_Class5,standard,Power Plant,,,,5,A, -128064053,Int_Powerplant_Size6_Class1,standard,Power Plant,,,,6,E, -128064054,Int_Powerplant_Size6_Class2,standard,Power Plant,,,,6,D, -128064055,Int_Powerplant_Size6_Class3,standard,Power Plant,,,,6,C, -128064056,Int_Powerplant_Size6_Class4,standard,Power Plant,,,,6,B, -128064057,Int_Powerplant_Size6_Class5,standard,Power Plant,,,,6,A, -128064058,Int_Powerplant_Size7_Class1,standard,Power Plant,,,,7,E, -128064059,Int_Powerplant_Size7_Class2,standard,Power Plant,,,,7,D, -128064060,Int_Powerplant_Size7_Class3,standard,Power Plant,,,,7,C, -128064061,Int_Powerplant_Size7_Class4,standard,Power Plant,,,,7,B, -128064062,Int_Powerplant_Size7_Class5,standard,Power Plant,,,,7,A, -128064063,Int_Powerplant_Size8_Class1,standard,Power Plant,,,,8,E, -128064064,Int_Powerplant_Size8_Class2,standard,Power Plant,,,,8,D, -128064065,Int_Powerplant_Size8_Class3,standard,Power Plant,,,,8,C, -128064066,Int_Powerplant_Size8_Class4,standard,Power Plant,,,,8,B, -128064067,Int_Powerplant_Size8_Class5,standard,Power Plant,,,,8,A, -128064068,Int_Engine_Size2_Class1,standard,Thrusters,,,,2,E, -128064069,Int_Engine_Size2_Class2,standard,Thrusters,,,,2,D, -128064070,Int_Engine_Size2_Class3,standard,Thrusters,,,,2,C, -128064071,Int_Engine_Size2_Class4,standard,Thrusters,,,,2,B, -128064072,Int_Engine_Size2_Class5,standard,Thrusters,,,,2,A, -128064073,Int_Engine_Size3_Class1,standard,Thrusters,,,,3,E, -128064074,Int_Engine_Size3_Class2,standard,Thrusters,,,,3,D, -128064075,Int_Engine_Size3_Class3,standard,Thrusters,,,,3,C, -128064076,Int_Engine_Size3_Class4,standard,Thrusters,,,,3,B, -128064077,Int_Engine_Size3_Class5,standard,Thrusters,,,,3,A, -128064078,Int_Engine_Size4_Class1,standard,Thrusters,,,,4,E, -128064079,Int_Engine_Size4_Class2,standard,Thrusters,,,,4,D, -128064080,Int_Engine_Size4_Class3,standard,Thrusters,,,,4,C, -128064081,Int_Engine_Size4_Class4,standard,Thrusters,,,,4,B, -128064082,Int_Engine_Size4_Class5,standard,Thrusters,,,,4,A, -128064083,Int_Engine_Size5_Class1,standard,Thrusters,,,,5,E, -128064084,Int_Engine_Size5_Class2,standard,Thrusters,,,,5,D, -128064085,Int_Engine_Size5_Class3,standard,Thrusters,,,,5,C, -128064086,Int_Engine_Size5_Class4,standard,Thrusters,,,,5,B, -128064087,Int_Engine_Size5_Class5,standard,Thrusters,,,,5,A, -128064088,Int_Engine_Size6_Class1,standard,Thrusters,,,,6,E, -128064089,Int_Engine_Size6_Class2,standard,Thrusters,,,,6,D, -128064090,Int_Engine_Size6_Class3,standard,Thrusters,,,,6,C, -128064091,Int_Engine_Size6_Class4,standard,Thrusters,,,,6,B, -128064092,Int_Engine_Size6_Class5,standard,Thrusters,,,,6,A, -128064093,Int_Engine_Size7_Class1,standard,Thrusters,,,,7,E, -128064094,Int_Engine_Size7_Class2,standard,Thrusters,,,,7,D, -128064095,Int_Engine_Size7_Class3,standard,Thrusters,,,,7,C, -128064096,Int_Engine_Size7_Class4,standard,Thrusters,,,,7,B, -128064097,Int_Engine_Size7_Class5,standard,Thrusters,,,,7,A, -128064098,Int_Engine_Size8_Class1,standard,Thrusters,,,,8,E, -128064099,Int_Engine_Size8_Class2,standard,Thrusters,,,,8,D, -128064100,Int_Engine_Size8_Class3,standard,Thrusters,,,,8,C, -128064101,Int_Engine_Size8_Class4,standard,Thrusters,,,,8,B, -128064102,Int_Engine_Size8_Class5,standard,Thrusters,,,,8,A, -128064103,Int_Hyperdrive_Size2_Class1,standard,Frame Shift Drive,,,,2,E, -128064104,Int_Hyperdrive_Size2_Class2,standard,Frame Shift Drive,,,,2,D, -128064105,Int_Hyperdrive_Size2_Class3,standard,Frame Shift Drive,,,,2,C, -128064106,Int_Hyperdrive_Size2_Class4,standard,Frame Shift Drive,,,,2,B, -128064107,Int_Hyperdrive_Size2_Class5,standard,Frame Shift Drive,,,,2,A, -128064108,Int_Hyperdrive_Size3_Class1,standard,Frame Shift Drive,,,,3,E, -128064109,Int_Hyperdrive_Size3_Class2,standard,Frame Shift Drive,,,,3,D, -128064110,Int_Hyperdrive_Size3_Class3,standard,Frame Shift Drive,,,,3,C, -128064111,Int_Hyperdrive_Size3_Class4,standard,Frame Shift Drive,,,,3,B, -128064112,Int_Hyperdrive_Size3_Class5,standard,Frame Shift Drive,,,,3,A, -128064113,Int_Hyperdrive_Size4_Class1,standard,Frame Shift Drive,,,,4,E, -128064114,Int_Hyperdrive_Size4_Class2,standard,Frame Shift Drive,,,,4,D, -128064115,Int_Hyperdrive_Size4_Class3,standard,Frame Shift Drive,,,,4,C, -128064116,Int_Hyperdrive_Size4_Class4,standard,Frame Shift Drive,,,,4,B, -128064117,Int_Hyperdrive_Size4_Class5,standard,Frame Shift Drive,,,,4,A, -128064118,Int_Hyperdrive_Size5_Class1,standard,Frame Shift Drive,,,,5,E, -128064119,Int_Hyperdrive_Size5_Class2,standard,Frame Shift Drive,,,,5,D, -128064120,Int_Hyperdrive_Size5_Class3,standard,Frame Shift Drive,,,,5,C, -128064121,Int_Hyperdrive_Size5_Class4,standard,Frame Shift Drive,,,,5,B, -128064122,Int_Hyperdrive_Size5_Class5,standard,Frame Shift Drive,,,,5,A, -128064123,Int_Hyperdrive_Size6_Class1,standard,Frame Shift Drive,,,,6,E, -128064124,Int_Hyperdrive_Size6_Class2,standard,Frame Shift Drive,,,,6,D, -128064125,Int_Hyperdrive_Size6_Class3,standard,Frame Shift Drive,,,,6,C, -128064126,Int_Hyperdrive_Size6_Class4,standard,Frame Shift Drive,,,,6,B, -128064127,Int_Hyperdrive_Size6_Class5,standard,Frame Shift Drive,,,,6,A, -128064128,Int_Hyperdrive_Size7_Class1,standard,Frame Shift Drive,,,,7,E, -128064129,Int_Hyperdrive_Size7_Class2,standard,Frame Shift Drive,,,,7,D, -128064130,Int_Hyperdrive_Size7_Class3,standard,Frame Shift Drive,,,,7,C, -128064131,Int_Hyperdrive_Size7_Class4,standard,Frame Shift Drive,,,,7,B, -128064132,Int_Hyperdrive_Size7_Class5,standard,Frame Shift Drive,,,,7,A, -128064133,Int_Hyperdrive_Size8_Class1,standard,Frame Shift Drive,,,,8,E, -128064134,Int_Hyperdrive_Size8_Class2,standard,Frame Shift Drive,,,,8,D, -128064135,Int_Hyperdrive_Size8_Class3,standard,Frame Shift Drive,,,,8,C, -128064136,Int_Hyperdrive_Size8_Class4,standard,Frame Shift Drive,,,,8,B, -128064137,Int_Hyperdrive_Size8_Class5,standard,Frame Shift Drive,,,,8,A, -128064138,Int_LifeSupport_Size1_Class1,standard,Life Support,,,,1,E, -128064139,Int_LifeSupport_Size1_Class2,standard,Life Support,,,,1,D, -128064140,Int_LifeSupport_Size1_Class3,standard,Life Support,,,,1,C, -128064141,Int_LifeSupport_Size1_Class4,standard,Life Support,,,,1,B, -128064142,Int_LifeSupport_Size1_Class5,standard,Life Support,,,,1,A, -128064143,Int_LifeSupport_Size2_Class1,standard,Life Support,,,,2,E, -128064144,Int_LifeSupport_Size2_Class2,standard,Life Support,,,,2,D, -128064145,Int_LifeSupport_Size2_Class3,standard,Life Support,,,,2,C, -128064146,Int_LifeSupport_Size2_Class4,standard,Life Support,,,,2,B, -128064147,Int_LifeSupport_Size2_Class5,standard,Life Support,,,,2,A, -128064148,Int_LifeSupport_Size3_Class1,standard,Life Support,,,,3,E, -128064149,Int_LifeSupport_Size3_Class2,standard,Life Support,,,,3,D, -128064150,Int_LifeSupport_Size3_Class3,standard,Life Support,,,,3,C, -128064151,Int_LifeSupport_Size3_Class4,standard,Life Support,,,,3,B, -128064152,Int_LifeSupport_Size3_Class5,standard,Life Support,,,,3,A, -128064153,Int_LifeSupport_Size4_Class1,standard,Life Support,,,,4,E, -128064154,Int_LifeSupport_Size4_Class2,standard,Life Support,,,,4,D, -128064155,Int_LifeSupport_Size4_Class3,standard,Life Support,,,,4,C, -128064156,Int_LifeSupport_Size4_Class4,standard,Life Support,,,,4,B, -128064157,Int_LifeSupport_Size4_Class5,standard,Life Support,,,,4,A, -128064158,Int_LifeSupport_Size5_Class1,standard,Life Support,,,,5,E, -128064159,Int_LifeSupport_Size5_Class2,standard,Life Support,,,,5,D, -128064160,Int_LifeSupport_Size5_Class3,standard,Life Support,,,,5,C, -128064161,Int_LifeSupport_Size5_Class4,standard,Life Support,,,,5,B, -128064162,Int_LifeSupport_Size5_Class5,standard,Life Support,,,,5,A, -128064163,Int_LifeSupport_Size6_Class1,standard,Life Support,,,,6,E, -128064164,Int_LifeSupport_Size6_Class2,standard,Life Support,,,,6,D, -128064165,Int_LifeSupport_Size6_Class3,standard,Life Support,,,,6,C, -128064166,Int_LifeSupport_Size6_Class4,standard,Life Support,,,,6,B, -128064167,Int_LifeSupport_Size6_Class5,standard,Life Support,,,,6,A, -128064168,Int_LifeSupport_Size7_Class1,standard,Life Support,,,,7,E, -128064169,Int_LifeSupport_Size7_Class2,standard,Life Support,,,,7,D, -128064170,Int_LifeSupport_Size7_Class3,standard,Life Support,,,,7,C, -128064171,Int_LifeSupport_Size7_Class4,standard,Life Support,,,,7,B, -128064172,Int_LifeSupport_Size7_Class5,standard,Life Support,,,,7,A, -128064173,Int_LifeSupport_Size8_Class1,standard,Life Support,,,,8,E, -128064174,Int_LifeSupport_Size8_Class2,standard,Life Support,,,,8,D, -128064175,Int_LifeSupport_Size8_Class3,standard,Life Support,,,,8,C, -128064176,Int_LifeSupport_Size8_Class4,standard,Life Support,,,,8,B, -128064177,Int_LifeSupport_Size8_Class5,standard,Life Support,,,,8,A, -128064178,Int_PowerDistributor_Size1_Class1,standard,Power Distributor,,,,1,E, -128064179,Int_PowerDistributor_Size1_Class2,standard,Power Distributor,,,,1,D, -128064180,Int_PowerDistributor_Size1_Class3,standard,Power Distributor,,,,1,C, -128064181,Int_PowerDistributor_Size1_Class4,standard,Power Distributor,,,,1,B, -128064182,Int_PowerDistributor_Size1_Class5,standard,Power Distributor,,,,1,A, -128064183,Int_PowerDistributor_Size2_Class1,standard,Power Distributor,,,,2,E, -128064184,Int_PowerDistributor_Size2_Class2,standard,Power Distributor,,,,2,D, -128064185,Int_PowerDistributor_Size2_Class3,standard,Power Distributor,,,,2,C, -128064186,Int_PowerDistributor_Size2_Class4,standard,Power Distributor,,,,2,B, -128064187,Int_PowerDistributor_Size2_Class5,standard,Power Distributor,,,,2,A, -128064188,Int_PowerDistributor_Size3_Class1,standard,Power Distributor,,,,3,E, -128064189,Int_PowerDistributor_Size3_Class2,standard,Power Distributor,,,,3,D, -128064190,Int_PowerDistributor_Size3_Class3,standard,Power Distributor,,,,3,C, -128064191,Int_PowerDistributor_Size3_Class4,standard,Power Distributor,,,,3,B, -128064192,Int_PowerDistributor_Size3_Class5,standard,Power Distributor,,,,3,A, -128064193,Int_PowerDistributor_Size4_Class1,standard,Power Distributor,,,,4,E, -128064194,Int_PowerDistributor_Size4_Class2,standard,Power Distributor,,,,4,D, -128064195,Int_PowerDistributor_Size4_Class3,standard,Power Distributor,,,,4,C, -128064196,Int_PowerDistributor_Size4_Class4,standard,Power Distributor,,,,4,B, -128064197,Int_PowerDistributor_Size4_Class5,standard,Power Distributor,,,,4,A, -128064198,Int_PowerDistributor_Size5_Class1,standard,Power Distributor,,,,5,E, -128064199,Int_PowerDistributor_Size5_Class2,standard,Power Distributor,,,,5,D, -128064200,Int_PowerDistributor_Size5_Class3,standard,Power Distributor,,,,5,C, -128064201,Int_PowerDistributor_Size5_Class4,standard,Power Distributor,,,,5,B, -128064202,Int_PowerDistributor_Size5_Class5,standard,Power Distributor,,,,5,A, -128064203,Int_PowerDistributor_Size6_Class1,standard,Power Distributor,,,,6,E, -128064204,Int_PowerDistributor_Size6_Class2,standard,Power Distributor,,,,6,D, -128064205,Int_PowerDistributor_Size6_Class3,standard,Power Distributor,,,,6,C, -128064206,Int_PowerDistributor_Size6_Class4,standard,Power Distributor,,,,6,B, -128064207,Int_PowerDistributor_Size6_Class5,standard,Power Distributor,,,,6,A, -128064208,Int_PowerDistributor_Size7_Class1,standard,Power Distributor,,,,7,E, -128064209,Int_PowerDistributor_Size7_Class2,standard,Power Distributor,,,,7,D, -128064210,Int_PowerDistributor_Size7_Class3,standard,Power Distributor,,,,7,C, -128064211,Int_PowerDistributor_Size7_Class4,standard,Power Distributor,,,,7,B, -128064212,Int_PowerDistributor_Size7_Class5,standard,Power Distributor,,,,7,A, -128064213,Int_PowerDistributor_Size8_Class1,standard,Power Distributor,,,,8,E, -128064214,Int_PowerDistributor_Size8_Class2,standard,Power Distributor,,,,8,D, -128064215,Int_PowerDistributor_Size8_Class3,standard,Power Distributor,,,,8,C, -128064216,Int_PowerDistributor_Size8_Class4,standard,Power Distributor,,,,8,B, -128064217,Int_PowerDistributor_Size8_Class5,standard,Power Distributor,,,,8,A, -128064218,Int_Sensors_Size1_Class1,standard,Sensors,,,,1,E, -128064219,Int_Sensors_Size1_Class2,standard,Sensors,,,,1,D, -128064220,Int_Sensors_Size1_Class3,standard,Sensors,,,,1,C, -128064221,Int_Sensors_Size1_Class4,standard,Sensors,,,,1,B, -128064222,Int_Sensors_Size1_Class5,standard,Sensors,,,,1,A, -128064223,Int_Sensors_Size2_Class1,standard,Sensors,,,,2,E, -128064224,Int_Sensors_Size2_Class2,standard,Sensors,,,,2,D, -128064225,Int_Sensors_Size2_Class3,standard,Sensors,,,,2,C, -128064226,Int_Sensors_Size2_Class4,standard,Sensors,,,,2,B, -128064227,Int_Sensors_Size2_Class5,standard,Sensors,,,,2,A, -128064228,Int_Sensors_Size3_Class1,standard,Sensors,,,,3,E, -128064229,Int_Sensors_Size3_Class2,standard,Sensors,,,,3,D, -128064230,Int_Sensors_Size3_Class3,standard,Sensors,,,,3,C, -128064231,Int_Sensors_Size3_Class4,standard,Sensors,,,,3,B, -128064232,Int_Sensors_Size3_Class5,standard,Sensors,,,,3,A, -128064233,Int_Sensors_Size4_Class1,standard,Sensors,,,,4,E, -128064234,Int_Sensors_Size4_Class2,standard,Sensors,,,,4,D, -128064235,Int_Sensors_Size4_Class3,standard,Sensors,,,,4,C, -128064236,Int_Sensors_Size4_Class4,standard,Sensors,,,,4,B, -128064237,Int_Sensors_Size4_Class5,standard,Sensors,,,,4,A, -128064238,Int_Sensors_Size5_Class1,standard,Sensors,,,,5,E, -128064239,Int_Sensors_Size5_Class2,standard,Sensors,,,,5,D, -128064240,Int_Sensors_Size5_Class3,standard,Sensors,,,,5,C, -128064241,Int_Sensors_Size5_Class4,standard,Sensors,,,,5,B, -128064242,Int_Sensors_Size5_Class5,standard,Sensors,,,,5,A, -128064243,Int_Sensors_Size6_Class1,standard,Sensors,,,,6,E, -128064244,Int_Sensors_Size6_Class2,standard,Sensors,,,,6,D, -128064245,Int_Sensors_Size6_Class3,standard,Sensors,,,,6,C, -128064246,Int_Sensors_Size6_Class4,standard,Sensors,,,,6,B, -128064247,Int_Sensors_Size6_Class5,standard,Sensors,,,,6,A, -128064248,Int_Sensors_Size7_Class1,standard,Sensors,,,,7,E, -128064249,Int_Sensors_Size7_Class2,standard,Sensors,,,,7,D, -128064250,Int_Sensors_Size7_Class3,standard,Sensors,,,,7,C, -128064251,Int_Sensors_Size7_Class4,standard,Sensors,,,,7,B, -128064252,Int_Sensors_Size7_Class5,standard,Sensors,,,,7,A, -128064253,Int_Sensors_Size8_Class1,standard,Sensors,,,,8,E, -128064254,Int_Sensors_Size8_Class2,standard,Sensors,,,,8,D, -128064255,Int_Sensors_Size8_Class3,standard,Sensors,,,,8,C, -128064256,Int_Sensors_Size8_Class4,standard,Sensors,,,,8,B, -128064257,Int_Sensors_Size8_Class5,standard,Sensors,,,,8,A, -128064258,Int_ShieldGenerator_Size1_Class1,internal,Shield Generator,,,,1,E, -128064259,Int_ShieldGenerator_Size1_Class2,internal,Shield Generator,,,,1,D, -128064260,Int_ShieldGenerator_Size1_Class3,internal,Shield Generator,,,,1,C, -128064262,Int_ShieldGenerator_Size1_Class5,internal,Shield Generator,,,,1,A, -128064263,Int_ShieldGenerator_Size2_Class1,internal,Shield Generator,,,,2,E, -128064264,Int_ShieldGenerator_Size2_Class2,internal,Shield Generator,,,,2,D, -128064265,Int_ShieldGenerator_Size2_Class3,internal,Shield Generator,,,,2,C, -128064266,Int_ShieldGenerator_Size2_Class4,internal,Shield Generator,,,,2,B, -128064267,Int_ShieldGenerator_Size2_Class5,internal,Shield Generator,,,,2,A, -128064268,Int_ShieldGenerator_Size3_Class1,internal,Shield Generator,,,,3,E, -128064269,Int_ShieldGenerator_Size3_Class2,internal,Shield Generator,,,,3,D, -128064270,Int_ShieldGenerator_Size3_Class3,internal,Shield Generator,,,,3,C, -128064271,Int_ShieldGenerator_Size3_Class4,internal,Shield Generator,,,,3,B, -128064272,Int_ShieldGenerator_Size3_Class5,internal,Shield Generator,,,,3,A, -128064273,Int_ShieldGenerator_Size4_Class1,internal,Shield Generator,,,,4,E, -128064274,Int_ShieldGenerator_Size4_Class2,internal,Shield Generator,,,,4,D, -128064275,Int_ShieldGenerator_Size4_Class3,internal,Shield Generator,,,,4,C, -128064276,Int_ShieldGenerator_Size4_Class4,internal,Shield Generator,,,,4,B, -128064277,Int_ShieldGenerator_Size4_Class5,internal,Shield Generator,,,,4,A, -128064278,Int_ShieldGenerator_Size5_Class1,internal,Shield Generator,,,,5,E, -128064279,Int_ShieldGenerator_Size5_Class2,internal,Shield Generator,,,,5,D, -128064280,Int_ShieldGenerator_Size5_Class3,internal,Shield Generator,,,,5,C, -128064281,Int_ShieldGenerator_Size5_Class4,internal,Shield Generator,,,,5,B, -128064282,Int_ShieldGenerator_Size5_Class5,internal,Shield Generator,,,,5,A, -128064283,Int_ShieldGenerator_Size6_Class1,internal,Shield Generator,,,,6,E, -128064284,Int_ShieldGenerator_Size6_Class2,internal,Shield Generator,,,,6,D, -128064285,Int_ShieldGenerator_Size6_Class3,internal,Shield Generator,,,,6,C, -128064286,Int_ShieldGenerator_Size6_Class4,internal,Shield Generator,,,,6,B, -128064287,Int_ShieldGenerator_Size6_Class5,internal,Shield Generator,,,,6,A, -128064288,Int_ShieldGenerator_Size7_Class1,internal,Shield Generator,,,,7,E, -128064289,Int_ShieldGenerator_Size7_Class2,internal,Shield Generator,,,,7,D, -128064290,Int_ShieldGenerator_Size7_Class3,internal,Shield Generator,,,,7,C, -128064291,Int_ShieldGenerator_Size7_Class4,internal,Shield Generator,,,,7,B, -128064292,Int_ShieldGenerator_Size7_Class5,internal,Shield Generator,,,,7,A, -128064293,Int_ShieldGenerator_Size8_Class1,internal,Shield Generator,,,,8,E, -128064294,Int_ShieldGenerator_Size8_Class2,internal,Shield Generator,,,,8,D, -128064295,Int_ShieldGenerator_Size8_Class3,internal,Shield Generator,,,,8,C, -128064296,Int_ShieldGenerator_Size8_Class4,internal,Shield Generator,,,,8,B, -128064297,Int_ShieldGenerator_Size8_Class5,internal,Shield Generator,,,,8,A, -128064298,Int_ShieldCellBank_Size1_Class1,internal,Shield Cell Bank,,,,1,E, -128064299,Int_ShieldCellBank_Size1_Class2,internal,Shield Cell Bank,,,,1,D, -128064300,Int_ShieldCellBank_Size1_Class3,internal,Shield Cell Bank,,,,1,C, -128064301,Int_ShieldCellBank_Size1_Class4,internal,Shield Cell Bank,,,,1,B, -128064302,Int_ShieldCellBank_Size1_Class5,internal,Shield Cell Bank,,,,1,A, -128064303,Int_ShieldCellBank_Size2_Class1,internal,Shield Cell Bank,,,,2,E, -128064304,Int_ShieldCellBank_Size2_Class2,internal,Shield Cell Bank,,,,2,D, -128064305,Int_ShieldCellBank_Size2_Class3,internal,Shield Cell Bank,,,,2,C, -128064306,Int_ShieldCellBank_Size2_Class4,internal,Shield Cell Bank,,,,2,B, -128064307,Int_ShieldCellBank_Size2_Class5,internal,Shield Cell Bank,,,,2,A, -128064308,Int_ShieldCellBank_Size3_Class1,internal,Shield Cell Bank,,,,3,E, -128064309,Int_ShieldCellBank_Size3_Class2,internal,Shield Cell Bank,,,,3,D, -128064310,Int_ShieldCellBank_Size3_Class3,internal,Shield Cell Bank,,,,3,C, -128064311,Int_ShieldCellBank_Size3_Class4,internal,Shield Cell Bank,,,,3,B, -128064312,Int_ShieldCellBank_Size3_Class5,internal,Shield Cell Bank,,,,3,A, -128064313,Int_ShieldCellBank_Size4_Class1,internal,Shield Cell Bank,,,,4,E, -128064314,Int_ShieldCellBank_Size4_Class2,internal,Shield Cell Bank,,,,4,D, -128064315,Int_ShieldCellBank_Size4_Class3,internal,Shield Cell Bank,,,,4,C, -128064316,Int_ShieldCellBank_Size4_Class4,internal,Shield Cell Bank,,,,4,B, -128064317,Int_ShieldCellBank_Size4_Class5,internal,Shield Cell Bank,,,,4,A, -128064318,Int_ShieldCellBank_Size5_Class1,internal,Shield Cell Bank,,,,5,E, -128064319,Int_ShieldCellBank_Size5_Class2,internal,Shield Cell Bank,,,,5,D, -128064320,Int_ShieldCellBank_Size5_Class3,internal,Shield Cell Bank,,,,5,C, -128064321,Int_ShieldCellBank_Size5_Class4,internal,Shield Cell Bank,,,,5,B, -128064322,Int_ShieldCellBank_Size5_Class5,internal,Shield Cell Bank,,,,5,A, -128064323,Int_ShieldCellBank_Size6_Class1,internal,Shield Cell Bank,,,,6,E, -128064324,Int_ShieldCellBank_Size6_Class2,internal,Shield Cell Bank,,,,6,D, -128064325,Int_ShieldCellBank_Size6_Class3,internal,Shield Cell Bank,,,,6,C, -128064326,Int_ShieldCellBank_Size6_Class4,internal,Shield Cell Bank,,,,6,B, -128064327,Int_ShieldCellBank_Size6_Class5,internal,Shield Cell Bank,,,,6,A, -128064328,Int_ShieldCellBank_Size7_Class1,internal,Shield Cell Bank,,,,7,E, -128064329,Int_ShieldCellBank_Size7_Class2,internal,Shield Cell Bank,,,,7,D, -128064330,Int_ShieldCellBank_Size7_Class3,internal,Shield Cell Bank,,,,7,C, -128064331,Int_ShieldCellBank_Size7_Class4,internal,Shield Cell Bank,,,,7,B, -128064332,Int_ShieldCellBank_Size7_Class5,internal,Shield Cell Bank,,,,7,A, -128064333,Int_ShieldCellBank_Size8_Class1,internal,Shield Cell Bank,,,,8,E, -128064334,Int_ShieldCellBank_Size8_Class2,internal,Shield Cell Bank,,,,8,D, -128064335,Int_ShieldCellBank_Size8_Class3,internal,Shield Cell Bank,,,,8,C, -128064336,Int_ShieldCellBank_Size8_Class4,internal,Shield Cell Bank,,,,8,B, -128064337,Int_ShieldCellBank_Size8_Class5,internal,Shield Cell Bank,,,,8,A, -128064338,Int_CargoRack_Size1_Class1,internal,Cargo Rack,,,,1,E, -128064339,Int_CargoRack_Size2_Class1,internal,Cargo Rack,,,,2,E, -128064340,Int_CargoRack_Size3_Class1,internal,Cargo Rack,,,,3,E, -128064341,Int_CargoRack_Size4_Class1,internal,Cargo Rack,,,,4,E, -128064342,Int_CargoRack_Size5_Class1,internal,Cargo Rack,,,,5,E, -128064343,Int_CargoRack_Size6_Class1,internal,Cargo Rack,,,,6,E, -128064344,Int_CargoRack_Size7_Class1,internal,Cargo Rack,,,,7,E, -128064345,Int_CargoRack_Size8_Class1,internal,Cargo Rack,,,,8,E, -128064346,Int_FuelTank_Size1_Class3,standard,Fuel Tank,,,,1,C, -128064347,Int_FuelTank_Size2_Class3,standard,Fuel Tank,,,,2,C, -128064348,Int_FuelTank_Size3_Class3,standard,Fuel Tank,,,,3,C, -128064349,Int_FuelTank_Size4_Class3,standard,Fuel Tank,,,,4,C, -128064350,Int_FuelTank_Size5_Class3,standard,Fuel Tank,,,,5,C, -128064351,Int_FuelTank_Size6_Class3,standard,Fuel Tank,,,,6,C, -128064352,Int_FuelTank_Size7_Class3,standard,Fuel Tank,,,,7,C, -128064353,Int_FuelTank_Size8_Class3,standard,Fuel Tank,,,,8,C, -128066402,Int_DroneControl_ResourceSiphon,internal,Limpet Control,,,,1,I, -128066532,Int_DroneControl_ResourceSiphon_Size1_Class1,internal,Hatch Breaker Limpet Controller,,,,1,E, -128066533,Int_DroneControl_ResourceSiphon_Size1_Class2,internal,Hatch Breaker Limpet Controller,,,,1,D, -128066534,Int_DroneControl_ResourceSiphon_Size1_Class3,internal,Hatch Breaker Limpet Controller,,,,1,C, -128066535,Int_DroneControl_ResourceSiphon_Size1_Class4,internal,Hatch Breaker Limpet Controller,,,,1,B, -128066536,Int_DroneControl_ResourceSiphon_Size1_Class5,internal,Hatch Breaker Limpet Controller,,,,1,A, -128066537,Int_DroneControl_ResourceSiphon_Size3_Class1,internal,Hatch Breaker Limpet Controller,,,,3,E, -128066538,Int_DroneControl_ResourceSiphon_Size3_Class2,internal,Hatch Breaker Limpet Controller,,,,3,D, -128066539,Int_DroneControl_ResourceSiphon_Size3_Class3,internal,Hatch Breaker Limpet Controller,,,,3,C, -128066540,Int_DroneControl_ResourceSiphon_Size3_Class4,internal,Hatch Breaker Limpet Controller,,,,3,B, -128066541,Int_DroneControl_ResourceSiphon_Size3_Class5,internal,Hatch Breaker Limpet Controller,,,,3,A, -128066542,Int_DroneControl_ResourceSiphon_Size5_Class1,internal,Hatch Breaker Limpet Controller,,,,5,E, -128066543,Int_DroneControl_ResourceSiphon_Size5_Class2,internal,Hatch Breaker Limpet Controller,,,,5,D, -128066544,Int_DroneControl_ResourceSiphon_Size5_Class3,internal,Hatch Breaker Limpet Controller,,,,5,C, -128066545,Int_DroneControl_ResourceSiphon_Size5_Class4,internal,Hatch Breaker Limpet Controller,,,,5,B, -128066546,Int_DroneControl_ResourceSiphon_Size5_Class5,internal,Hatch Breaker Limpet Controller,,,,5,A, -128066547,Int_DroneControl_ResourceSiphon_Size7_Class1,internal,Hatch Breaker Limpet Controller,,,,7,E, -128066548,Int_DroneControl_ResourceSiphon_Size7_Class2,internal,Hatch Breaker Limpet Controller,,,,7,D, -128066549,Int_DroneControl_ResourceSiphon_Size7_Class3,internal,Hatch Breaker Limpet Controller,,,,7,C, -128066550,Int_DroneControl_ResourceSiphon_Size7_Class4,internal,Hatch Breaker Limpet Controller,,,,7,B, -128066551,Int_DroneControl_ResourceSiphon_Size7_Class5,internal,Hatch Breaker Limpet Controller,,,,7,A, -128662520,Hpt_CargoScanner_Size0_Class1,utility,Cargo Scanner,,,,0,E, -128662521,Hpt_CargoScanner_Size0_Class2,utility,Cargo Scanner,,,,0,D, -128662522,Hpt_CargoScanner_Size0_Class3,utility,Cargo Scanner,,,,0,C, -128662523,Hpt_CargoScanner_Size0_Class4,utility,Cargo Scanner,,,,0,B, -128662524,Hpt_CargoScanner_Size0_Class5,utility,Cargo Scanner,,,,0,A, -128662525,Hpt_CloudScanner_Size0_Class1,utility,Frame Shift Wake Scanner,,,,0,E, -128662526,Hpt_CloudScanner_Size0_Class2,utility,Frame Shift Wake Scanner,,,,0,D, -128662527,Hpt_CloudScanner_Size0_Class3,utility,Frame Shift Wake Scanner,,,,0,C, -128662528,Hpt_CloudScanner_Size0_Class4,utility,Frame Shift Wake Scanner,,,,0,B, -128662529,Hpt_CloudScanner_Size0_Class5,utility,Frame Shift Wake Scanner,,,,0,A, -128662530,Hpt_CrimeScanner_Size0_Class1,utility,Kill Warrant Scanner,,,,0,E, -128662531,Hpt_CrimeScanner_Size0_Class2,utility,Kill Warrant Scanner,,,,0,D, -128662532,Hpt_CrimeScanner_Size0_Class3,utility,Kill Warrant Scanner,,,,0,C, -128662533,Hpt_CrimeScanner_Size0_Class4,utility,Kill Warrant Scanner,,,,0,B, -128662534,Hpt_CrimeScanner_Size0_Class5,utility,Kill Warrant Scanner,,,,0,A, -128662535,Int_StellarBodyDiscoveryScanner_Standard,internal,Basic Discovery Scanner,,,,1,E,removed -128663560,Int_StellarBodyDiscoveryScanner_Intermediate,internal,Intermediate Discovery Scanner,,,,1,D,removed -128663561,Int_StellarBodyDiscoveryScanner_Advanced,internal,Advanced Discovery Scanner,,,,1,C,removed -128666634,Int_DetailedSurfaceScanner_Tiny,internal,Detailed Surface Scanner,,,,1,I, -128666635,Int_PowerPlant_Size2_Class1_free,standard,Power Plant,,,,2,E, -128666636,Int_Engine_Size2_Class1_free,standard,Thrusters,,,,2,E, -128666637,Int_Hyperdrive_Size2_Class1_free,standard,Frame Shift Drive,,,,2,E, -128666638,Int_LifeSupport_Size1_Class1_free,standard,Life Support,,,,1,E, -128666639,Int_PowerDistributor_Size1_Class1_free,standard,Power Distributor,,,,1,E, -128666640,Int_Sensors_Size1_Class1_free,standard,Sensors,,,,1,E, -128666641,Int_ShieldGenerator_Size2_Class1_free,internal,Shield Generator,,,,2,E, -128666642,Int_StellarBodyDiscoveryScanner_Standard_free,internal,Basic Discovery Scanner,,,,1,E, -128666643,Int_CargoRack_Size2_Class1_free,internal,Cargo Rack,,,,2,E, -128666644,Int_FuelScoop_Size1_Class1,internal,Fuel Scoop,,,,1,E, -128666645,Int_FuelScoop_Size2_Class1,internal,Fuel Scoop,,,,2,E, -128666646,Int_FuelScoop_Size3_Class1,internal,Fuel Scoop,,,,3,E, -128666647,Int_FuelScoop_Size4_Class1,internal,Fuel Scoop,,,,4,E, -128666648,Int_FuelScoop_Size5_Class1,internal,Fuel Scoop,,,,5,E, -128666649,Int_FuelScoop_Size6_Class1,internal,Fuel Scoop,,,,6,E, -128666650,Int_FuelScoop_Size7_Class1,internal,Fuel Scoop,,,,7,E, -128666651,Int_FuelScoop_Size8_Class1,internal,Fuel Scoop,,,,8,E, -128666652,Int_FuelScoop_Size1_Class2,internal,Fuel Scoop,,,,1,D, -128666653,Int_FuelScoop_Size2_Class2,internal,Fuel Scoop,,,,2,D, -128666654,Int_FuelScoop_Size3_Class2,internal,Fuel Scoop,,,,3,D, -128666655,Int_FuelScoop_Size4_Class2,internal,Fuel Scoop,,,,4,D, -128666656,Int_FuelScoop_Size5_Class2,internal,Fuel Scoop,,,,5,D, -128666657,Int_FuelScoop_Size6_Class2,internal,Fuel Scoop,,,,6,D, -128666658,Int_FuelScoop_Size7_Class2,internal,Fuel Scoop,,,,7,D, -128666659,Int_FuelScoop_Size8_Class2,internal,Fuel Scoop,,,,8,D, -128666660,Int_FuelScoop_Size1_Class3,internal,Fuel Scoop,,,,1,C, -128666661,Int_FuelScoop_Size2_Class3,internal,Fuel Scoop,,,,2,C, -128666662,Int_FuelScoop_Size3_Class3,internal,Fuel Scoop,,,,3,C, -128666663,Int_FuelScoop_Size4_Class3,internal,Fuel Scoop,,,,4,C, -128666664,Int_FuelScoop_Size5_Class3,internal,Fuel Scoop,,,,5,C, -128666665,Int_FuelScoop_Size6_Class3,internal,Fuel Scoop,,,,6,C, -128666666,Int_FuelScoop_Size7_Class3,internal,Fuel Scoop,,,,7,C, -128666667,Int_FuelScoop_Size8_Class3,internal,Fuel Scoop,,,,8,C, -128666668,Int_FuelScoop_Size1_Class4,internal,Fuel Scoop,,,,1,B, -128666669,Int_FuelScoop_Size2_Class4,internal,Fuel Scoop,,,,2,B, -128666670,Int_FuelScoop_Size3_Class4,internal,Fuel Scoop,,,,3,B, -128666671,Int_FuelScoop_Size4_Class4,internal,Fuel Scoop,,,,4,B, -128666672,Int_FuelScoop_Size5_Class4,internal,Fuel Scoop,,,,5,B, -128666673,Int_FuelScoop_Size6_Class4,internal,Fuel Scoop,,,,6,B, -128666674,Int_FuelScoop_Size7_Class4,internal,Fuel Scoop,,,,7,B, -128666675,Int_FuelScoop_Size8_Class4,internal,Fuel Scoop,,,,8,B, -128666676,Int_FuelScoop_Size1_Class5,internal,Fuel Scoop,,,,1,A, -128666677,Int_FuelScoop_Size2_Class5,internal,Fuel Scoop,,,,2,A, -128666678,Int_FuelScoop_Size3_Class5,internal,Fuel Scoop,,,,3,A, -128666679,Int_FuelScoop_Size4_Class5,internal,Fuel Scoop,,,,4,A, -128666680,Int_FuelScoop_Size5_Class5,internal,Fuel Scoop,,,,5,A, -128666681,Int_FuelScoop_Size6_Class5,internal,Fuel Scoop,,,,6,A, -128666682,Int_FuelScoop_Size7_Class5,internal,Fuel Scoop,,,,7,A, -128666683,Int_FuelScoop_Size8_Class5,internal,Fuel Scoop,,,,8,A, -128666684,Int_Refinery_Size1_Class1,internal,Refinery,,,,1,E, -128666685,Int_Refinery_Size2_Class1,internal,Refinery,,,,2,E, -128666686,Int_Refinery_Size3_Class1,internal,Refinery,,,,3,E, -128666687,Int_Refinery_Size4_Class1,internal,Refinery,,,,4,E, -128666688,Int_Refinery_Size1_Class2,internal,Refinery,,,,1,D, -128666689,Int_Refinery_Size2_Class2,internal,Refinery,,,,2,D, -128666690,Int_Refinery_Size3_Class2,internal,Refinery,,,,3,D, -128666691,Int_Refinery_Size4_Class2,internal,Refinery,,,,4,D, -128666692,Int_Refinery_Size1_Class3,internal,Refinery,,,,1,C, -128666693,Int_Refinery_Size2_Class3,internal,Refinery,,,,2,C, -128666694,Int_Refinery_Size3_Class3,internal,Refinery,,,,3,C, -128666695,Int_Refinery_Size4_Class3,internal,Refinery,,,,4,C, -128666696,Int_Refinery_Size1_Class4,internal,Refinery,,,,1,B, -128666697,Int_Refinery_Size2_Class4,internal,Refinery,,,,2,B, -128666698,Int_Refinery_Size3_Class4,internal,Refinery,,,,3,B, -128666699,Int_Refinery_Size4_Class4,internal,Refinery,,,,4,B, -128666700,Int_Refinery_Size1_Class5,internal,Refinery,,,,1,A, -128666701,Int_Refinery_Size2_Class5,internal,Refinery,,,,2,A, -128666702,Int_Refinery_Size3_Class5,internal,Refinery,,,,3,A, -128666703,Int_Refinery_Size4_Class5,internal,Refinery,,,,4,A, -128666704,Int_FSDInterdictor_Size1_Class1,internal,Frame Shift Drive Interdictor,,,,1,E, -128666705,Int_FSDInterdictor_Size2_Class1,internal,Frame Shift Drive Interdictor,,,,2,E, -128666706,Int_FSDInterdictor_Size3_Class1,internal,Frame Shift Drive Interdictor,,,,3,E, -128666707,Int_FSDInterdictor_Size4_Class1,internal,Frame Shift Drive Interdictor,,,,4,E, -128666708,Int_FSDInterdictor_Size1_Class2,internal,Frame Shift Drive Interdictor,,,,1,D, -128666709,Int_FSDInterdictor_Size2_Class2,internal,Frame Shift Drive Interdictor,,,,2,D, -128666710,Int_FSDInterdictor_Size3_Class2,internal,Frame Shift Drive Interdictor,,,,3,D, -128666711,Int_FSDInterdictor_Size4_Class2,internal,Frame Shift Drive Interdictor,,,,4,D, -128666712,Int_FSDInterdictor_Size1_Class3,internal,Frame Shift Drive Interdictor,,,,1,C, -128666713,Int_FSDInterdictor_Size2_Class3,internal,Frame Shift Drive Interdictor,,,,2,C, -128666714,Int_FSDInterdictor_Size3_Class3,internal,Frame Shift Drive Interdictor,,,,3,C, -128666715,Int_FSDInterdictor_Size4_Class3,internal,Frame Shift Drive Interdictor,,,,4,C, -128666716,Int_FSDInterdictor_Size1_Class4,internal,Frame Shift Drive Interdictor,,,,1,B, -128666717,Int_FSDInterdictor_Size2_Class4,internal,Frame Shift Drive Interdictor,,,,2,B, -128666718,Int_FSDInterdictor_Size3_Class4,internal,Frame Shift Drive Interdictor,,,,3,B, -128666719,Int_FSDInterdictor_Size4_Class4,internal,Frame Shift Drive Interdictor,,,,4,B, -128666720,Int_FSDInterdictor_Size1_Class5,internal,Frame Shift Drive Interdictor,,,,1,A, -128666721,Int_FSDInterdictor_Size2_Class5,internal,Frame Shift Drive Interdictor,,,,2,A, -128666722,Int_FSDInterdictor_Size3_Class5,internal,Frame Shift Drive Interdictor,,,,3,A, -128666723,Int_FSDInterdictor_Size4_Class5,internal,Frame Shift Drive Interdictor,,,,4,A, -128666724,Hpt_DumbfireMissileRack_Fixed_Small,hardpoint,Missile Rack,Fixed,Dumbfire,,1,B, -128666725,Hpt_DumbfireMissileRack_Fixed_Medium,hardpoint,Missile Rack,Fixed,Dumbfire,,2,B, -128667018,Int_FuelTank_Size1_Class3_free,standard,Fuel Tank,,,,1,C, -128667598,Int_Repairer_Size1_Class1,internal,Auto Field-Maintenance Unit,,,,1,E, -128667599,Int_Repairer_Size2_Class1,internal,Auto Field-Maintenance Unit,,,,2,E, -128667600,Int_Repairer_Size3_Class1,internal,Auto Field-Maintenance Unit,,,,3,E, -128667601,Int_Repairer_Size4_Class1,internal,Auto Field-Maintenance Unit,,,,4,E, -128667602,Int_Repairer_Size5_Class1,internal,Auto Field-Maintenance Unit,,,,5,E, -128667603,Int_Repairer_Size6_Class1,internal,Auto Field-Maintenance Unit,,,,6,E, -128667604,Int_Repairer_Size7_Class1,internal,Auto Field-Maintenance Unit,,,,7,E, -128667605,Int_Repairer_Size8_Class1,internal,Auto Field-Maintenance Unit,,,,8,E, -128667606,Int_Repairer_Size1_Class2,internal,Auto Field-Maintenance Unit,,,,1,D, -128667607,Int_Repairer_Size2_Class2,internal,Auto Field-Maintenance Unit,,,,2,D, -128667608,Int_Repairer_Size3_Class2,internal,Auto Field-Maintenance Unit,,,,3,D, -128667609,Int_Repairer_Size4_Class2,internal,Auto Field-Maintenance Unit,,,,4,D, -128667610,Int_Repairer_Size5_Class2,internal,Auto Field-Maintenance Unit,,,,5,D, -128667611,Int_Repairer_Size6_Class2,internal,Auto Field-Maintenance Unit,,,,6,D, -128667612,Int_Repairer_Size7_Class2,internal,Auto Field-Maintenance Unit,,,,7,D, -128667613,Int_Repairer_Size8_Class2,internal,Auto Field-Maintenance Unit,,,,8,D, -128667614,Int_Repairer_Size1_Class3,internal,Auto Field-Maintenance Unit,,,,1,C, -128667615,Int_Repairer_Size2_Class3,internal,Auto Field-Maintenance Unit,,,,2,C, -128667616,Int_Repairer_Size3_Class3,internal,Auto Field-Maintenance Unit,,,,3,C, -128667617,Int_Repairer_Size4_Class3,internal,Auto Field-Maintenance Unit,,,,4,C, -128667618,Int_Repairer_Size5_Class3,internal,Auto Field-Maintenance Unit,,,,5,C, -128667619,Int_Repairer_Size6_Class3,internal,Auto Field-Maintenance Unit,,,,6,C, -128667620,Int_Repairer_Size7_Class3,internal,Auto Field-Maintenance Unit,,,,7,C, -128667621,Int_Repairer_Size8_Class3,internal,Auto Field-Maintenance Unit,,,,8,C, -128667622,Int_Repairer_Size1_Class4,internal,Auto Field-Maintenance Unit,,,,1,B, -128667623,Int_Repairer_Size2_Class4,internal,Auto Field-Maintenance Unit,,,,2,B, -128667624,Int_Repairer_Size3_Class4,internal,Auto Field-Maintenance Unit,,,,3,B, -128667625,Int_Repairer_Size4_Class4,internal,Auto Field-Maintenance Unit,,,,4,B, -128667626,Int_Repairer_Size5_Class4,internal,Auto Field-Maintenance Unit,,,,5,B, -128667627,Int_Repairer_Size6_Class4,internal,Auto Field-Maintenance Unit,,,,6,B, -128667628,Int_Repairer_Size7_Class4,internal,Auto Field-Maintenance Unit,,,,7,B, -128667629,Int_Repairer_Size8_Class4,internal,Auto Field-Maintenance Unit,,,,8,B, -128667630,Int_Repairer_Size1_Class5,internal,Auto Field-Maintenance Unit,,,,1,A, -128667631,Int_Repairer_Size2_Class5,internal,Auto Field-Maintenance Unit,,,,2,A, -128667632,Int_Repairer_Size3_Class5,internal,Auto Field-Maintenance Unit,,,,3,A, -128667633,Int_Repairer_Size4_Class5,internal,Auto Field-Maintenance Unit,,,,4,A, -128667634,Int_Repairer_Size5_Class5,internal,Auto Field-Maintenance Unit,,,,5,A, -128667635,Int_Repairer_Size6_Class5,internal,Auto Field-Maintenance Unit,,,,6,A, -128667636,Int_Repairer_Size7_Class5,internal,Auto Field-Maintenance Unit,,,,7,A, -128667637,Int_Repairer_Size8_Class5,internal,Auto Field-Maintenance Unit,,,,8,A, -128668532,Hpt_ShieldBooster_Size0_Class1,utility,Shield Booster,,,,0,E, -128668533,Hpt_ShieldBooster_Size0_Class2,utility,Shield Booster,,,,0,D, -128668534,Hpt_ShieldBooster_Size0_Class3,utility,Shield Booster,,,,0,C, -128668535,Hpt_ShieldBooster_Size0_Class4,utility,Shield Booster,,,,0,B, -128668536,Hpt_ShieldBooster_Size0_Class5,utility,Shield Booster,,,,0,A, -128668537,Int_HullReinforcement_Size1_Class1,internal,Hull Reinforcement Package,,,,1,E, -128668538,Int_HullReinforcement_Size1_Class2,internal,Hull Reinforcement Package,,,,1,D, -128668539,Int_HullReinforcement_Size2_Class1,internal,Hull Reinforcement Package,,,,2,E, -128668540,Int_HullReinforcement_Size2_Class2,internal,Hull Reinforcement Package,,,,2,D, -128668541,Int_HullReinforcement_Size3_Class1,internal,Hull Reinforcement Package,,,,3,E, -128668542,Int_HullReinforcement_Size3_Class2,internal,Hull Reinforcement Package,,,,3,D, -128668543,Int_HullReinforcement_Size4_Class1,internal,Hull Reinforcement Package,,,,4,E, -128668544,Int_HullReinforcement_Size4_Class2,internal,Hull Reinforcement Package,,,,4,D, -128668545,Int_HullReinforcement_Size5_Class1,internal,Hull Reinforcement Package,,,,5,E, -128668546,Int_HullReinforcement_Size5_Class2,internal,Hull Reinforcement Package,,,,5,D, -128671120,Hpt_Cannon_Gimbal_Large,hardpoint,Cannon,Gimballed,,,3,C, -128671218,DiamondBack_Armour_Grade1,standard,Lightweight Alloy,,,Diamondback Scout,1,I, -128671219,DiamondBack_Armour_Grade2,standard,Reinforced Alloy,,,Diamondback Scout,1,I, -128671220,DiamondBack_Armour_Grade3,standard,Military Grade Composite,,,Diamondback Scout,1,I, -128671221,DiamondBack_Armour_Mirrored,standard,Mirrored Surface Composite,,,Diamondback Scout,1,I, -128671222,DiamondBack_Armour_Reactive,standard,Reactive Surface Composite,,,Diamondback Scout,1,I, -128671224,Empire_Courier_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Courier,1,I, -128671225,Empire_Courier_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Courier,1,I, -128671226,Empire_Courier_Armour_Grade3,standard,Military Grade Composite,,,Imperial Courier,1,I, -128671227,Empire_Courier_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Courier,1,I, -128671228,Empire_Courier_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Courier,1,I, -128671229,Int_DroneControl_Collection_Size1_Class1,internal,Collector Limpet Controller,,,,1,E, -128671230,Int_DroneControl_Collection_Size1_Class2,internal,Collector Limpet Controller,,,,1,D, -128671231,Int_DroneControl_Collection_Size1_Class3,internal,Collector Limpet Controller,,,,1,C, -128671232,Int_DroneControl_Collection_Size1_Class4,internal,Collector Limpet Controller,,,,1,B, -128671233,Int_DroneControl_Collection_Size1_Class5,internal,Collector Limpet Controller,,,,1,A, -128671234,Int_DroneControl_Collection_Size3_Class1,internal,Collector Limpet Controller,,,,3,E, -128671235,Int_DroneControl_Collection_Size3_Class2,internal,Collector Limpet Controller,,,,3,D, -128671236,Int_DroneControl_Collection_Size3_Class3,internal,Collector Limpet Controller,,,,3,C, -128671237,Int_DroneControl_Collection_Size3_Class4,internal,Collector Limpet Controller,,,,3,B, -128671238,Int_DroneControl_Collection_Size3_Class5,internal,Collector Limpet Controller,,,,3,A, -128671239,Int_DroneControl_Collection_Size5_Class1,internal,Collector Limpet Controller,,,,5,E, -128671240,Int_DroneControl_Collection_Size5_Class2,internal,Collector Limpet Controller,,,,5,D, -128671241,Int_DroneControl_Collection_Size5_Class3,internal,Collector Limpet Controller,,,,5,C, -128671242,Int_DroneControl_Collection_Size5_Class4,internal,Collector Limpet Controller,,,,5,B, -128671243,Int_DroneControl_Collection_Size5_Class5,internal,Collector Limpet Controller,,,,5,A, -128671244,Int_DroneControl_Collection_Size7_Class1,internal,Collector Limpet Controller,,,,7,E, -128671245,Int_DroneControl_Collection_Size7_Class2,internal,Collector Limpet Controller,,,,7,D, -128671246,Int_DroneControl_Collection_Size7_Class3,internal,Collector Limpet Controller,,,,7,C, -128671247,Int_DroneControl_Collection_Size7_Class4,internal,Collector Limpet Controller,,,,7,B, -128671248,Int_DroneControl_Collection_Size7_Class5,internal,Collector Limpet Controller,,,,7,A, -128671249,Int_DroneControl_FuelTransfer_Size1_Class1,internal,Fuel Transfer Limpet Controller,,,,1,E, -128671250,Int_DroneControl_FuelTransfer_Size1_Class2,internal,Fuel Transfer Limpet Controller,,,,1,D, -128671251,Int_DroneControl_FuelTransfer_Size1_Class3,internal,Fuel Transfer Limpet Controller,,,,1,C, -128671252,Int_DroneControl_FuelTransfer_Size1_Class4,internal,Fuel Transfer Limpet Controller,,,,1,B, -128671253,Int_DroneControl_FuelTransfer_Size1_Class5,internal,Fuel Transfer Limpet Controller,,,,1,A, -128671254,Int_DroneControl_FuelTransfer_Size3_Class1,internal,Fuel Transfer Limpet Controller,,,,3,E, -128671255,Int_DroneControl_FuelTransfer_Size3_Class2,internal,Fuel Transfer Limpet Controller,,,,3,D, -128671256,Int_DroneControl_FuelTransfer_Size3_Class3,internal,Fuel Transfer Limpet Controller,,,,3,C, -128671257,Int_DroneControl_FuelTransfer_Size3_Class4,internal,Fuel Transfer Limpet Controller,,,,3,B, -128671258,Int_DroneControl_FuelTransfer_Size3_Class5,internal,Fuel Transfer Limpet Controller,,,,3,A, -128671259,Int_DroneControl_FuelTransfer_Size5_Class1,internal,Fuel Transfer Limpet Controller,,,,5,E, -128671260,Int_DroneControl_FuelTransfer_Size5_Class2,internal,Fuel Transfer Limpet Controller,,,,5,D, -128671261,Int_DroneControl_FuelTransfer_Size5_Class3,internal,Fuel Transfer Limpet Controller,,,,5,C, -128671262,Int_DroneControl_FuelTransfer_Size5_Class4,internal,Fuel Transfer Limpet Controller,,,,5,B, -128671263,Int_DroneControl_FuelTransfer_Size5_Class5,internal,Fuel Transfer Limpet Controller,,,,5,A, -128671264,Int_DroneControl_FuelTransfer_Size7_Class1,internal,Fuel Transfer Limpet Controller,,,,7,E, -128671265,Int_DroneControl_FuelTransfer_Size7_Class2,internal,Fuel Transfer Limpet Controller,,,,7,D, -128671266,Int_DroneControl_FuelTransfer_Size7_Class3,internal,Fuel Transfer Limpet Controller,,,,7,C, -128671267,Int_DroneControl_FuelTransfer_Size7_Class4,internal,Fuel Transfer Limpet Controller,,,,7,B, -128671268,Int_DroneControl_FuelTransfer_Size7_Class5,internal,Fuel Transfer Limpet Controller,,,,7,A, -128671269,Int_DroneControl_Prospector_Size1_Class1,internal,Prospector Limpet Controller,,,,1,E, -128671270,Int_DroneControl_Prospector_Size1_Class2,internal,Prospector Limpet Controller,,,,1,D, -128671271,Int_DroneControl_Prospector_Size1_Class3,internal,Prospector Limpet Controller,,,,1,C, -128671272,Int_DroneControl_Prospector_Size1_Class4,internal,Prospector Limpet Controller,,,,1,B, -128671273,Int_DroneControl_Prospector_Size1_Class5,internal,Prospector Limpet Controller,,,,1,A, -128671274,Int_DroneControl_Prospector_Size3_Class1,internal,Prospector Limpet Controller,,,,3,E, -128671275,Int_DroneControl_Prospector_Size3_Class2,internal,Prospector Limpet Controller,,,,3,D, -128671276,Int_DroneControl_Prospector_Size3_Class3,internal,Prospector Limpet Controller,,,,3,C, -128671277,Int_DroneControl_Prospector_Size3_Class4,internal,Prospector Limpet Controller,,,,3,B, -128671278,Int_DroneControl_Prospector_Size3_Class5,internal,Prospector Limpet Controller,,,,3,A, -128671279,Int_DroneControl_Prospector_Size5_Class1,internal,Prospector Limpet Controller,,,,5,E, -128671280,Int_DroneControl_Prospector_Size5_Class2,internal,Prospector Limpet Controller,,,,5,D, -128671281,Int_DroneControl_Prospector_Size5_Class3,internal,Prospector Limpet Controller,,,,5,C, -128671282,Int_DroneControl_Prospector_Size5_Class4,internal,Prospector Limpet Controller,,,,5,B, -128671283,Int_DroneControl_Prospector_Size5_Class5,internal,Prospector Limpet Controller,,,,5,A, -128671284,Int_DroneControl_Prospector_Size7_Class1,internal,Prospector Limpet Controller,,,,7,E, -128671285,Int_DroneControl_Prospector_Size7_Class2,internal,Prospector Limpet Controller,,,,7,D, -128671286,Int_DroneControl_Prospector_Size7_Class3,internal,Prospector Limpet Controller,,,,7,C, -128671287,Int_DroneControl_Prospector_Size7_Class4,internal,Prospector Limpet Controller,,,,7,B, -128671288,Int_DroneControl_Prospector_Size7_Class5,internal,Prospector Limpet Controller,,,,7,A, -128671321,Hpt_Slugshot_Gimbal_Large,hardpoint,Fragment Cannon,Gimballed,,,3,C, -128671322,Hpt_Slugshot_Turret_Large,hardpoint,Fragment Cannon,Turreted,,,3,C, -128671323,Int_ShieldGenerator_Size1_Class5_Strong,internal,Prismatic Shield Generator,,,,1,A,ELITE_SPECIFIC_V_POWER_100000 -128671324,Int_ShieldGenerator_Size2_Class5_Strong,internal,Prismatic Shield Generator,,,,2,A,ELITE_SPECIFIC_V_POWER_100000 -128671325,Int_ShieldGenerator_Size3_Class5_Strong,internal,Prismatic Shield Generator,,,,3,A,ELITE_SPECIFIC_V_POWER_100000 -128671326,Int_ShieldGenerator_Size4_Class5_Strong,internal,Prismatic Shield Generator,,,,4,A,ELITE_SPECIFIC_V_POWER_100000 -128671327,Int_ShieldGenerator_Size5_Class5_Strong,internal,Prismatic Shield Generator,,,,5,A,ELITE_SPECIFIC_V_POWER_100000 -128671328,Int_ShieldGenerator_Size6_Class5_Strong,internal,Prismatic Shield Generator,,,,6,A,ELITE_SPECIFIC_V_POWER_100000 -128671329,Int_ShieldGenerator_Size7_Class5_Strong,internal,Prismatic Shield Generator,,,,7,A,ELITE_SPECIFIC_V_POWER_100000 -128671330,Int_ShieldGenerator_Size8_Class5_Strong,internal,Prismatic Shield Generator,,,,8,A,ELITE_SPECIFIC_V_POWER_100000 -128671331,Int_ShieldGenerator_Size1_Class3_Fast,internal,Bi-Weave Shield Generator,,,,1,C, -128671332,Int_ShieldGenerator_Size2_Class3_Fast,internal,Bi-Weave Shield Generator,,,,2,C, -128671333,Int_ShieldGenerator_Size3_Class3_Fast,internal,Bi-Weave Shield Generator,,,,3,C, -128671334,Int_ShieldGenerator_Size4_Class3_Fast,internal,Bi-Weave Shield Generator,,,,4,C, -128671335,Int_ShieldGenerator_Size5_Class3_Fast,internal,Bi-Weave Shield Generator,,,,5,C, -128671336,Int_ShieldGenerator_Size6_Class3_Fast,internal,Bi-Weave Shield Generator,,,,6,C, -128671337,Int_ShieldGenerator_Size7_Class3_Fast,internal,Bi-Weave Shield Generator,,,,7,C, -128671338,Int_ShieldGenerator_Size8_Class3_Fast,internal,Bi-Weave Shield Generator,,,,8,C, -128671339,Hpt_PlasmaAccelerator_Fixed_Large_Advanced,hardpoint,Advanced Plasma Accelerator,Fixed,,,3,B,ELITE_SPECIFIC_V_POWER_100050 -128671340,Hpt_MiningLaser_Fixed_Small_Advanced,hardpoint,Mining Lance,Fixed,,,1,D,ELITE_SPECIFIC_V_POWER_100080 -128671341,Hpt_Railgun_Fixed_Medium_Burst,hardpoint,Imperial Hammer Rail Gun,Fixed,,,2,B,ELITE_SPECIFIC_V_POWER_100020 -128671342,Hpt_PulseLaser_Fixed_Medium_Disruptor,hardpoint,Pulse Disruptor Laser,Fixed,,,2,E,ELITE_SPECIFIC_V_POWER_100040 -128671343,Hpt_Slugshot_Fixed_Large_Range,hardpoint,Pacifier Frag-Cannon,Fixed,,,3,C,ELITE_SPECIFIC_V_POWER_100060 -128671344,Hpt_DrunkMissileRack_Fixed_Medium,hardpoint,Pack-Hound Missile Rack,Fixed,Swarm,,2,B,ELITE_SPECIFIC_V_POWER_100070 -128671345,Hpt_MultiCannon_Fixed_Small_Strong,hardpoint,Enforcer Cannon,Fixed,,,1,F,ELITE_SPECIFIC_V_POWER_100090 -128671346,Hpt_BeamLaser_Fixed_Small_Heat,hardpoint,Retributor Beam Laser,Fixed,,,1,E,ELITE_SPECIFIC_V_POWER_100010 -128671448,Hpt_MineLauncher_Fixed_Small_Impulse,hardpoint,Shock Mine Launcher,Fixed,,,1,I, -128671449,Hpt_PulseLaserBurst_Fixed_Small_Scatter,hardpoint,Cytoscrambler Burst Laser,Fixed,,,1,F,ELITE_SPECIFIC_V_POWER_100100 -128671832,DiamondBackXL_Armour_Grade1,standard,Lightweight Alloy,,,Diamondback Explorer,1,I, -128671833,DiamondBackXL_Armour_Grade2,standard,Reinforced Alloy,,,Diamondback Explorer,1,I, -128671834,DiamondBackXL_Armour_Grade3,standard,Military Grade Composite,,,Diamondback Explorer,1,I, -128671835,DiamondBackXL_Armour_Mirrored,standard,Mirrored Surface Composite,,,Diamondback Explorer,1,I, -128671836,DiamondBackXL_Armour_Reactive,standard,Reactive Surface Composite,,,Diamondback Explorer,1,I, -128672140,Empire_Eagle_Armour_Grade1,standard,Lightweight Alloy,,,Imperial Eagle,1,I, -128672141,Empire_Eagle_Armour_Grade2,standard,Reinforced Alloy,,,Imperial Eagle,1,I, -128672142,Empire_Eagle_Armour_Grade3,standard,Military Grade Composite,,,Imperial Eagle,1,I, -128672143,Empire_Eagle_Armour_Mirrored,standard,Mirrored Surface Composite,,,Imperial Eagle,1,I, -128672144,Empire_Eagle_Armour_Reactive,standard,Reactive Surface Composite,,,Imperial Eagle,1,I, -128672147,Federation_Dropship_MkII_Armour_Grade1,standard,Lightweight Alloy,,,Federal Assault Ship,1,I, -128672148,Federation_Dropship_MkII_Armour_Grade2,standard,Reinforced Alloy,,,Federal Assault Ship,1,I, -128672149,Federation_Dropship_MkII_Armour_Grade3,standard,Military Grade Composite,,,Federal Assault Ship,1,I, -128672150,Federation_Dropship_MkII_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Assault Ship,1,I, -128672151,Federation_Dropship_MkII_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Assault Ship,1,I, -128672154,Federation_Gunship_Armour_Grade1,standard,Lightweight Alloy,,,Federal Gunship,1,I, -128672155,Federation_Gunship_Armour_Grade2,standard,Reinforced Alloy,,,Federal Gunship,1,I, -128672156,Federation_Gunship_Armour_Grade3,standard,Military Grade Composite,,,Federal Gunship,1,I, -128672157,Federation_Gunship_Armour_Mirrored,standard,Mirrored Surface Composite,,,Federal Gunship,1,I, -128672158,Federation_Gunship_Armour_Reactive,standard,Reactive Surface Composite,,,Federal Gunship,1,I, -128672257,Viper_MkIV_Armour_Grade1,standard,Lightweight Alloy,,,Viper MkIV,1,I, -128672258,Viper_MkIV_Armour_Grade2,standard,Reinforced Alloy,,,Viper MkIV,1,I, -128672259,Viper_MkIV_Armour_Grade3,standard,Military Grade Composite,,,Viper MkIV,1,I, -128672260,Viper_MkIV_Armour_Mirrored,standard,Mirrored Surface Composite,,,Viper MkIV,1,I, -128672261,Viper_MkIV_Armour_Reactive,standard,Reactive Surface Composite,,,Viper MkIV,1,I, -128672264,CobraMkIV_Armour_Grade1,standard,Lightweight Alloy,,,Cobra MkIV,1,I, -128672265,CobraMkIV_Armour_Grade2,standard,Reinforced Alloy,,,Cobra MkIV,1,I, -128672266,CobraMkIV_Armour_Grade3,standard,Military Grade Composite,,,Cobra MkIV,1,I, -128672267,CobraMkIV_Armour_Mirrored,standard,Mirrored Surface Composite,,,Cobra MkIV,1,I, -128672268,CobraMkIV_Armour_Reactive,standard,Reactive Surface Composite,,,Cobra MkIV,1,I, -128672271,Independant_Trader_Armour_Grade1,standard,Lightweight Alloy,,,Keelback,1,I, -128672272,Independant_Trader_Armour_Grade2,standard,Reinforced Alloy,,,Keelback,1,I, -128672273,Independant_Trader_Armour_Grade3,standard,Military Grade Composite,,,Keelback,1,I, -128672274,Independant_Trader_Armour_Mirrored,standard,Mirrored Surface Composite,,,Keelback,1,I, -128672275,Independant_Trader_Armour_Reactive,standard,Reactive Surface Composite,,,Keelback,1,I, -128672278,Asp_Scout_Armour_Grade1,standard,Lightweight Alloy,,,Asp Scout,1,I, -128672279,Asp_Scout_Armour_Grade2,standard,Reinforced Alloy,,,Asp Scout,1,I, -128672280,Asp_Scout_Armour_Grade3,standard,Military Grade Composite,,,Asp Scout,1,I, -128672281,Asp_Scout_Armour_Mirrored,standard,Mirrored Surface Composite,,,Asp Scout,1,I, -128672282,Asp_Scout_Armour_Reactive,standard,Reactive Surface Composite,,,Asp Scout,1,I, -128672288,Int_BuggyBay_Size2_Class1,internal,Planetary Vehicle Hangar,,,,2,H,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128672289,Int_BuggyBay_Size2_Class2,internal,Planetary Vehicle Hangar,,,,2,G,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128672290,Int_BuggyBay_Size4_Class1,internal,Planetary Vehicle Hangar,,,,4,H,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128672291,Int_BuggyBay_Size4_Class2,internal,Planetary Vehicle Hangar,,,,4,G,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128672292,Int_BuggyBay_Size6_Class1,internal,Planetary Vehicle Hangar,,,,6,H,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128672293,Int_BuggyBay_Size6_Class2,internal,Planetary Vehicle Hangar,,,,6,G,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128672317,Int_PlanetApproachSuite,internal,Planetary Approach Suite,,,,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128681641,Int_CorrosionProofCargoRack_Size1_Class1,internal,Corrosion Resistant Cargo Rack,,,,1,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128681992,Int_CorrosionProofCargoRack_Size1_Class2,internal,Corrosion Resistant Cargo Rack,,,,1,F,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128681994,Hpt_BeamLaser_Gimbal_Huge,hardpoint,Beam Laser,Gimballed,,,4,A, -128681995,Hpt_PulseLaser_Gimbal_Huge,hardpoint,Pulse Laser,Gimballed,,,4,A, -128681996,Hpt_MultiCannon_Gimbal_Huge,hardpoint,Multi-Cannon,Gimballed,,,4,A, -128682013,Int_Engine_Size3_Class5_Fast,standard,Enhanced Performance Thrusters,,,,3,A, -128682014,Int_Engine_Size2_Class5_Fast,standard,Enhanced Performance Thrusters,,,,2,A, -128727920,Hpt_PulseLaserBurst_Gimbal_Huge,hardpoint,Burst Laser,Gimballed,,,4,E, -128727922,Int_PassengerCabin_Size4_Class1,internal,Economy Class Passenger Cabin,,,,4,E, -128727923,Int_PassengerCabin_Size4_Class2,internal,Business Class Passenger Cabin,,,,4,D, -128727924,Int_PassengerCabin_Size4_Class3,internal,First Class Passenger Cabin,,,,4,C, -128727925,Int_PassengerCabin_Size5_Class4,internal,Luxury Class Passenger Cabin,,,,5,B, -128727926,Int_PassengerCabin_Size6_Class1,internal,Economy Class Passenger Cabin,,,,6,E, -128727927,Int_PassengerCabin_Size6_Class2,internal,Business Class Passenger Cabin,,,,6,D, -128727928,Int_PassengerCabin_Size6_Class3,internal,First Class Passenger Cabin,,,,6,C, -128727929,Int_PassengerCabin_Size6_Class4,internal,Luxury Class Passenger Cabin,,,,6,B, -128727930,Int_FighterBay_Size5_Class1,internal,Fighter Hangar,,,,5,D,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128727931,Int_FighterBay_Size6_Class1,internal,Fighter Hangar,,,,6,D,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128727932,Int_FighterBay_Size7_Class1,internal,Fighter Hangar,,,,7,D,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128732552,Hpt_DumbfireMissileRack_Fixed_Medium_Lasso,hardpoint,Rocket Propelled FSD Disruptor,Fixed,Dumbfire,,2,B,ELITE_SPECIFIC_V_POWER_100120 -128734690,Int_PassengerCabin_Size2_Class1,internal,Economy Class Passenger Cabin,,,,2,E, -128734691,Int_PassengerCabin_Size3_Class1,internal,Economy Class Passenger Cabin,,,,3,E, -128734692,Int_PassengerCabin_Size3_Class2,internal,Business Class Passenger Cabin,,,,3,D, -128734693,Int_PassengerCabin_Size5_Class1,internal,Economy Class Passenger Cabin,,,,5,E, -128734694,Int_PassengerCabin_Size5_Class2,internal,Business Class Passenger Cabin,,,,5,D, -128734695,Int_PassengerCabin_Size5_Class3,internal,First Class Passenger Cabin,,,,5,C, -128737270,Int_ModuleReinforcement_Size1_Class1,internal,Module Reinforcement Package,,,,1,E, -128737271,Int_ModuleReinforcement_Size1_Class2,internal,Module Reinforcement Package,,,,1,D, -128737272,Int_ModuleReinforcement_Size2_Class1,internal,Module Reinforcement Package,,,,2,E, -128737273,Int_ModuleReinforcement_Size2_Class2,internal,Module Reinforcement Package,,,,2,D, -128737274,Int_ModuleReinforcement_Size3_Class1,internal,Module Reinforcement Package,,,,3,E, -128737275,Int_ModuleReinforcement_Size3_Class2,internal,Module Reinforcement Package,,,,3,D, -128737276,Int_ModuleReinforcement_Size4_Class1,internal,Module Reinforcement Package,,,,4,E, -128737277,Int_ModuleReinforcement_Size4_Class2,internal,Module Reinforcement Package,,,,4,D, -128737278,Int_ModuleReinforcement_Size5_Class1,internal,Module Reinforcement Package,,,,5,E, -128737279,Int_ModuleReinforcement_Size5_Class2,internal,Module Reinforcement Package,,,,5,D, -128740819,Hpt_MiningLaser_Turret_Small,hardpoint,Mining Laser,Turreted,,,1,D, -128740820,Hpt_MiningLaser_Turret_Medium,hardpoint,Mining Laser,Turreted,,,2,D, -128771884,Hpt_AntiUnknownShutdown_Tiny,utility,Shutdown Field Neutraliser,,,,0,F,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128777327,Int_DroneControl_Repair_Size1_Class1,internal,Repair Limpet Controller,,,,1,E, -128777328,Int_DroneControl_Repair_Size1_Class2,internal,Repair Limpet Controller,,,,1,D, -128777329,Int_DroneControl_Repair_Size1_Class3,internal,Repair Limpet Controller,,,,1,C, -128777330,Int_DroneControl_Repair_Size1_Class4,internal,Repair Limpet Controller,,,,1,B, -128777331,Int_DroneControl_Repair_Size1_Class5,internal,Repair Limpet Controller,,,,1,A, -128777332,Int_DroneControl_Repair_Size3_Class1,internal,Repair Limpet Controller,,,,3,E, -128777333,Int_DroneControl_Repair_Size3_Class2,internal,Repair Limpet Controller,,,,3,D, -128777334,Int_DroneControl_Repair_Size3_Class3,internal,Repair Limpet Controller,,,,3,C, -128777335,Int_DroneControl_Repair_Size3_Class4,internal,Repair Limpet Controller,,,,3,B, -128777336,Int_DroneControl_Repair_Size3_Class5,internal,Repair Limpet Controller,,,,3,A, -128777337,Int_DroneControl_Repair_Size5_Class1,internal,Repair Limpet Controller,,,,5,E, -128777338,Int_DroneControl_Repair_Size5_Class2,internal,Repair Limpet Controller,,,,5,D, -128777339,Int_DroneControl_Repair_Size5_Class3,internal,Repair Limpet Controller,,,,5,C, -128777340,Int_DroneControl_Repair_Size5_Class4,internal,Repair Limpet Controller,,,,5,B, -128777341,Int_DroneControl_Repair_Size5_Class5,internal,Repair Limpet Controller,,,,5,A, -128777342,Int_DroneControl_Repair_Size7_Class1,internal,Repair Limpet Controller,,,,7,E, -128777343,Int_DroneControl_Repair_Size7_Class2,internal,Repair Limpet Controller,,,,7,D, -128777344,Int_DroneControl_Repair_Size7_Class3,internal,Repair Limpet Controller,,,,7,C, -128777345,Int_DroneControl_Repair_Size7_Class4,internal,Repair Limpet Controller,,,,7,B, -128777346,Int_DroneControl_Repair_Size7_Class5,internal,Repair Limpet Controller,,,,7,A, -128785621,Type9_Military_Armour_Grade1,standard,Lightweight Alloy,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128785622,Type9_Military_Armour_Grade2,standard,Reinforced Alloy,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128785623,Type9_Military_Armour_Grade3,standard,Military Grade Composite,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128785624,Type9_Military_Armour_Mirrored,standard,Mirrored Surface Composite,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128785625,Type9_Military_Armour_Reactive,standard,Reactive Surface Composite,,,Type-10 Defender,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128785626,Hpt_FlakMortar_Fixed_Medium,hardpoint,Remote Release Flak Launcher,Fixed,,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128788699,Hpt_ATDumbfireMissile_Fixed_Medium,hardpoint,AX Missile Rack,Fixed,Dumbfire,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128788700,Hpt_ATDumbfireMissile_Fixed_Large,hardpoint,AX Missile Rack,Fixed,Dumbfire,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128788701,Hpt_ATMultiCannon_Fixed_Medium,hardpoint,AX Multi-Cannon,Fixed,,,2,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128788702,Hpt_ATMultiCannon_Fixed_Large,hardpoint,AX Multi-Cannon,Fixed,,,3,C,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128788704,Hpt_ATDumbfireMissile_Turret_Medium,hardpoint,AX Missile Rack,Turreted,Dumbfire,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128788705,Hpt_ATDumbfireMissile_Turret_Large,hardpoint,AX Missile Rack,Turreted,Dumbfire,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793058,Hpt_FlakMortar_Turret_Medium,hardpoint,Remote Release Flak Launcher,Turreted,,,2,B,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793059,Hpt_ATMultiCannon_Turret_Medium,hardpoint,AX Multi-Cannon,Turreted,,,2,F,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793060,Hpt_ATMultiCannon_Turret_Large,hardpoint,AX Multi-Cannon,Turreted,,,3,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793115,Hpt_XenoScanner_Basic_Tiny,utility,Xeno Scanner,,,,0,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793116,Int_DroneControl_UnkVesselResearch,internal,Research Limpet Controller,,,,1,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793117,Int_MetaAlloyHullReinforcement_Size1_Class1,internal,Meta Alloy Hull Reinforcement,,,,1,E,ELITE_HORIZONS_V_METAHULL -128793118,Int_MetaAlloyHullReinforcement_Size1_Class2,internal,Meta Alloy Hull Reinforcement,,,,1,D,ELITE_HORIZONS_V_METAHULL -128793119,Int_MetaAlloyHullReinforcement_Size2_Class1,internal,Meta Alloy Hull Reinforcement,,,,2,E,ELITE_HORIZONS_V_METAHULL -128793120,Int_MetaAlloyHullReinforcement_Size2_Class2,internal,Meta Alloy Hull Reinforcement,,,,2,D,ELITE_HORIZONS_V_METAHULL -128793121,Int_MetaAlloyHullReinforcement_Size3_Class1,internal,Meta Alloy Hull Reinforcement,,,,3,E,ELITE_HORIZONS_V_METAHULL -128793122,Int_MetaAlloyHullReinforcement_Size3_Class2,internal,Meta Alloy Hull Reinforcement,,,,3,D,ELITE_HORIZONS_V_METAHULL -128793123,Int_MetaAlloyHullReinforcement_Size4_Class1,internal,Meta Alloy Hull Reinforcement,,,,4,E,ELITE_HORIZONS_V_METAHULL -128793124,Int_MetaAlloyHullReinforcement_Size4_Class2,internal,Meta Alloy Hull Reinforcement,,,,4,D,ELITE_HORIZONS_V_METAHULL -128793125,Int_MetaAlloyHullReinforcement_Size5_Class1,internal,Meta Alloy Hull Reinforcement,,,,5,E,ELITE_HORIZONS_V_METAHULL -128793126,Int_MetaAlloyHullReinforcement_Size5_Class2,internal,Meta Alloy Hull Reinforcement,,,,5,D,ELITE_HORIZONS_V_METAHULL -128793941,Int_DroneControl_Decontamination_Size1_Class1,internal,Decontamination Limpet Controller,,,,1,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793942,Int_DroneControl_Decontamination_Size3_Class1,internal,Decontamination Limpet Controller,,,,3,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793943,Int_DroneControl_Decontamination_Size5_Class1,internal,Decontamination Limpet Controller,,,,5,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128793944,Int_DroneControl_Decontamination_Size7_Class1,internal,Decontamination Limpet Controller,,,,7,E,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128808878,Hpt_XenoScannerMk2_Basic_Tiny,utility,Unknown Xeno Scanner Mk II,,,,?,?,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816569,Krait_MkII_Armour_Grade1,standard,Lightweight Alloy,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816570,Krait_MkII_Armour_Grade2,standard,Reinforced Alloy,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816571,Krait_MkII_Armour_Grade3,standard,Military Grade Composite,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816572,Krait_MkII_Armour_Mirrored,standard,Mirrored Surface Composite,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816573,Krait_MkII_Armour_Reactive,standard,Reactive Surface Composite,,,Krait MkII,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816576,TypeX_Armour_Grade1,standard,Lightweight Alloy,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816577,TypeX_Armour_Grade2,standard,Reinforced Alloy,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816578,TypeX_Armour_Grade3,standard,Military Grade Composite,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816579,TypeX_Armour_Mirrored,standard,Mirrored Surface Composite,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816580,TypeX_Armour_Reactive,standard,Reactive Surface Composite,,,Alliance Chieftain,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816583,TypeX_2_Armour_Grade1,standard,Lightweight Alloy,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816584,TypeX_2_Armour_Grade2,standard,Reinforced Alloy,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816585,TypeX_2_Armour_Grade3,standard,Military Grade Composite,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816586,TypeX_2_Armour_Mirrored,standard,Mirrored Surface Composite,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816587,TypeX_2_Armour_Reactive,standard,Reactive Surface Composite,,,Alliance Crusader,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816590,TypeX_3_Armour_Grade1,standard,Lightweight Alloy,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816591,TypeX_3_Armour_Grade2,standard,Reinforced Alloy,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816592,TypeX_3_Armour_Grade3,standard,Military Grade Composite,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816593,TypeX_3_Armour_Mirrored,standard,Mirrored Surface Composite,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128816594,TypeX_3_Armour_Reactive,standard,Reactive Surface Composite,,,Alliance Challenger,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128833687,Hpt_Guardian_GaussCannon_Fixed_Medium,hardpoint,Guardian Gauss Cannon,Fixed,,,2,B,ELITE_HORIZONS_V_GUARDIAN_GAUSS_FIXED_MEDIUM -128833944,Int_CorrosionProofCargoRack_Size4_Class1,internal,Corrosion Resistant Cargo Rack,,,,4,E,ELITE_HORIZONS_V_CORROSIONCARGO_SIZE4 -128833945,Int_GuardianHullReinforcement_Size1_Class1,internal,Guardian Hull Reinforcement,,,,1,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833946,Int_GuardianHullReinforcement_Size1_Class2,internal,Guardian Hull Reinforcement,,,,1,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833947,Int_GuardianHullReinforcement_Size2_Class1,internal,Guardian Hull Reinforcement,,,,2,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833948,Int_GuardianHullReinforcement_Size2_Class2,internal,Guardian Hull Reinforcement,,,,2,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833949,Int_GuardianHullReinforcement_Size3_Class1,internal,Guardian Hull Reinforcement,,,,3,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833950,Int_GuardianHullReinforcement_Size3_Class2,internal,Guardian Hull Reinforcement,,,,3,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833951,Int_GuardianHullReinforcement_Size4_Class1,internal,Guardian Hull Reinforcement,,,,4,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833952,Int_GuardianHullReinforcement_Size4_Class2,internal,Guardian Hull Reinforcement,,,,4,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833953,Int_GuardianHullReinforcement_Size5_Class1,internal,Guardian Hull Reinforcement,,,,5,E,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833954,Int_GuardianHullReinforcement_Size5_Class2,internal,Guardian Hull Reinforcement,,,,5,D,ELITE_HORIZONS_V_GUARDIAN_HULLREINFORCEMENT -128833955,Int_GuardianModuleReinforcement_Size1_Class1,internal,Guardian Module Reinforcement,,,,1,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833956,Int_GuardianModuleReinforcement_Size1_Class2,internal,Guardian Module Reinforcement,,,,1,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833957,Int_GuardianModuleReinforcement_Size2_Class1,internal,Guardian Module Reinforcement,,,,2,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833958,Int_GuardianModuleReinforcement_Size2_Class2,internal,Guardian Module Reinforcement,,,,2,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833959,Int_GuardianModuleReinforcement_Size3_Class1,internal,Guardian Module Reinforcement,,,,3,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833960,Int_GuardianModuleReinforcement_Size3_Class2,internal,Guardian Module Reinforcement,,,,3,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833961,Int_GuardianModuleReinforcement_Size4_Class1,internal,Guardian Module Reinforcement,,,,4,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833962,Int_GuardianModuleReinforcement_Size4_Class2,internal,Guardian Module Reinforcement,,,,4,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833963,Int_GuardianModuleReinforcement_Size5_Class1,internal,Guardian Module Reinforcement,,,,5,E,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833964,Int_GuardianModuleReinforcement_Size5_Class2,internal,Guardian Module Reinforcement,,,,5,D,ELITE_HORIZONS_V_GUARDIAN_MODULEREINFORCEMENT -128833965,Int_GuardianShieldReinforcement_Size1_Class1,internal,Guardian Shield Reinforcement,,,,1,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833966,Int_GuardianShieldReinforcement_Size1_Class2,internal,Guardian Shield Reinforcement,,,,1,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833967,Int_GuardianShieldReinforcement_Size2_Class1,internal,Guardian Shield Reinforcement,,,,2,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833968,Int_GuardianShieldReinforcement_Size2_Class2,internal,Guardian Shield Reinforcement,,,,2,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833969,Int_GuardianShieldReinforcement_Size3_Class1,internal,Guardian Shield Reinforcement,,,,3,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833970,Int_GuardianShieldReinforcement_Size3_Class2,internal,Guardian Shield Reinforcement,,,,3,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833971,Int_GuardianShieldReinforcement_Size4_Class1,internal,Guardian Shield Reinforcement,,,,4,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833972,Int_GuardianShieldReinforcement_Size4_Class2,internal,Guardian Shield Reinforcement,,,,4,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833973,Int_GuardianShieldReinforcement_Size5_Class1,internal,Guardian Shield Reinforcement,,,,5,E,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833974,Int_GuardianShieldReinforcement_Size5_Class2,internal,Guardian Shield Reinforcement,,,,5,D,ELITE_HORIZONS_V_GUARDIAN_SHIELDREINFORCEMENT -128833975,Int_GuardianFSDBooster_Size1,internal,Guardian FSD Booster,,,,1,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER -128833976,Int_GuardianFSDBooster_Size2,internal,Guardian FSD Booster,,,,2,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER -128833977,Int_GuardianFSDBooster_Size3,internal,Guardian FSD Booster,,,,3,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER -128833978,Int_GuardianFSDBooster_Size4,internal,Guardian FSD Booster,,,,4,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER -128833979,Int_GuardianFSDBooster_Size5,internal,Guardian FSD Booster,,,,5,H,ELITE_HORIZONS_V_GUARDIAN_FSDBOOSTER -128833980,Int_GuardianPowerDistributor_Size1,internal,Guardian Hybrid Power Distributor,,,,1,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833981,Int_GuardianPowerDistributor_Size2,internal,Guardian Hybrid Power Distributor,,,,2,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833982,Int_GuardianPowerDistributor_Size3,internal,Guardian Hybrid Power Distributor,,,,3,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833983,Int_GuardianPowerDistributor_Size4,internal,Guardian Hybrid Power Distributor,,,,4,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833984,Int_GuardianPowerDistributor_Size5,internal,Guardian Hybrid Power Distributor,,,,5,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833985,Int_GuardianPowerDistributor_Size6,internal,Guardian Hybrid Power Distributor,,,,6,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833986,Int_GuardianPowerDistributor_Size7,internal,Guardian Hybrid Power Distributor,,,,7,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833987,Int_GuardianPowerDistributor_Size8,internal,Guardian Hybrid Power Distributor,,,,8,A,ELITE_HORIZONS_V_GUARDIAN_POWERDISTRIBUTOR -128833988,Int_GuardianPowerplant_Size2,internal,Guardian Hybrid Power Plant,,,,2,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT -128833989,Int_GuardianPowerplant_Size3,internal,Guardian Hybrid Power Plant,,,,3,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT -128833990,Int_GuardianPowerplant_Size4,internal,Guardian Hybrid Power Plant,,,,4,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT -128833991,Int_GuardianPowerplant_Size5,internal,Guardian Hybrid Power Plant,,,,5,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT -128833992,Int_GuardianPowerplant_Size6,internal,Guardian Hybrid Power Plant,,,,6,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT -128833993,Int_GuardianPowerplant_Size7,internal,Guardian Hybrid Power Plant,,,,7,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT -128833994,Int_GuardianPowerplant_Size8,internal,Guardian Hybrid Power Plant,,,,8,A,ELITE_HORIZONS_V_GUARDIAN_POWERPLANT -128833995,Hpt_CausticMissile_Fixed_Medium,hardpoint,Enzyme Missile Rack,Fixed,Dumbfire,,2,B,ELITE_HORIZONS_V_CAUSTIC_MEDIUM -128833996,Hpt_FlechetteLauncher_Fixed_Medium,hardpoint,Remote Release Flechette Launcher,Fixed,,,2,B,ELITE_HORIZONS_V_FLECHETTE_FIXED_MEDIUM -128833997,Hpt_FlechetteLauncher_Turret_Medium,hardpoint,Remote Release Flechette Launcher,Turreted,,,2,B,ELITE_HORIZONS_V_FLECHETTE_TURRET_MEDIUM -128833998,Hpt_Guardian_PlasmaLauncher_Fixed_Medium,hardpoint,Guardian Plasma Charger,Fixed,,,2,B,ELITE_HORIZONS_V_GUARDIAN_PLASMA_FIXED_MEDIUM -128833999,Hpt_Guardian_PlasmaLauncher_Turret_Medium,hardpoint,Guardian Plasma Charger,Turreted,,,2,E,ELITE_HORIZONS_V_GUARDIAN_PLASMA_TURRET_MEDIUM -128834000,Hpt_Guardian_ShardCannon_Fixed_Medium,hardpoint,Guardian Shard Cannon,Fixed,,,2,A,ELITE_HORIZONS_V_GUARDIAN_SHARD_FIXED_MEDIUM -128834001,Hpt_Guardian_ShardCannon_Turret_Medium,hardpoint,Guardian Shard Cannon,Turreted,,,2,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_MEDIUM -128834002,Hpt_PlasmaShockCannon_Fixed_Medium,hardpoint,Shock Cannon,Fixed,,,2,D,ELITE_HORIZONS_V_PLASMASHOCK_FIXED_MEDIUM -128834003,Hpt_PlasmaShockCannon_Gimbal_Medium,hardpoint,Shock Cannon,Gimballed,,,2,D,ELITE_HORIZONS_V_PLASMASHOCK_GIMBAL_MEDIUM -128834004,Hpt_PlasmaShockCannon_Turret_Medium,hardpoint,Shock Cannon,Turreted,,,2,E,ELITE_HORIZONS_V_PLASMASHOCK_TURRET_MEDIUM -128834778,Hpt_Guardian_ShardCannon_Fixed_Large,hardpoint,Guardian Shard Cannon,Fixed,,,3,C,ELITE_HORIZONS_V_GUARDIAN_SHARD_FIXED_LARGE -128834779,Hpt_Guardian_ShardCannon_Turret_Large,hardpoint,Guardian Shard Cannon,Turreted,,,3,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_LARGE -128834780,Hpt_PlasmaShockCannon_Fixed_Large,hardpoint,Shock Cannon,Fixed,,,3,C,ELITE_HORIZONS_V_PLASMASHOCK_FIXED_LARGE -128834781,Hpt_PlasmaShockCannon_Gimbal_Large,hardpoint,Shock Cannon,Gimballed,,,3,C,ELITE_HORIZONS_V_PLASMASHOCK_GIMBAL_LARGE -128834782,Hpt_PlasmaShockCannon_Turret_Large,hardpoint,Shock Cannon,Turreted,,,3,D,ELITE_HORIZONS_V_PLASMASHOCK_TURRET_LARGE -128834783,Hpt_Guardian_PlasmaLauncher_Fixed_Large,hardpoint,Guardian Plasma Charger,Fixed,,,3,C,ELITE_HORIZONS_V_GUARDIAN_PLASMA_FIXED_LARGE -128834784,Hpt_Guardian_PlasmaLauncher_Turret_Large,hardpoint,Guardian Plasma Charger,Turreted,,,3,D,ELITE_HORIZONS_V_GUARDIAN_PLASMA_TURRET_LARGE -128837858,Int_DroneControl_Recon_Size1_Class1,internal,Recon Limpet Controller,,,,1,E, -128839283,Krait_Light_Armour_Grade1,standard,Lightweight Alloy,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128839284,Krait_Light_Armour_Grade2,standard,Reinforced Alloy,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128839285,Krait_Light_Armour_Grade3,standard,Military Grade Composite,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128839286,Krait_Light_Armour_Mirrored,standard,Mirrored Surface Composite,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128839287,Krait_Light_Armour_Reactive,standard,Reactive Surface Composite,,,Krait Phantom,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128841592,Int_DroneControl_Recon_Size3_Class1,internal,Recon Limpet Controller,,,,3,E, -128841593,Int_DroneControl_Recon_Size5_Class1,internal,Recon Limpet Controller,,,,5,E, -128841594,Int_DroneControl_Recon_Size7_Class1,internal,Recon Limpet Controller,,,,7,E, -128891602,Hpt_DumbfireMissileRack_Fixed_Large,hardpoint,Missile Rack,Fixed,Dumbfire,,3,A,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128891603,Hpt_PlasmaShockCannon_Turret_Small,hardpoint,Shock Cannon,Turreted,,,1,F,ELITE_HORIZONS_V_PLASMASHOCK_TURRET_SMALL -128891604,Hpt_PlasmaShockCannon_Gimbal_Small,hardpoint,Shock Cannon,Gimballed,,,1,E,ELITE_HORIZONS_V_PLASMASHOCK_GIMBAL_SMALL -128891605,Hpt_PlasmaShockCannon_Fixed_Small,hardpoint,Shock Cannon,Fixed,,,1,D,ELITE_HORIZONS_V_PLASMASHOCK_FIXED_SMALL -128891606,Hpt_Guardian_PlasmaLauncher_Turret_Small,hardpoint,Guardian Plasma Charger,Turreted,,,1,F,ELITE_HORIZONS_V_GUARDIAN_PLASMA_TURRET_SMALL -128891607,Hpt_Guardian_PlasmaLauncher_Fixed_Small,hardpoint,Guardian Plasma Charger,Fixed,,,1,D,ELITE_HORIZONS_V_GUARDIAN_PLASMA_FIXED_SMALL -128891608,Hpt_Guardian_ShardCannon_Turret_Small,hardpoint,Guardian Shard Cannon,Turreted,,,1,F,ELITE_HORIZONS_V_GUARDIAN_SHARD_TURRET_SMALL -128891609,Hpt_Guardian_ShardCannon_Fixed_Small,hardpoint,Guardian Shard Cannon,Fixed,,,1,D,ELITE_HORIZONS_V_GUARDIAN_SHARD_FIXED_SMALL -128891610,Hpt_Guardian_GaussCannon_Fixed_Small,hardpoint,Guardian Gauss Cannon,Fixed,,,1,D,ELITE_HORIZONS_V_GUARDIAN_GAUSS_FIXED_SMALL -128915454,Hpt_Mining_SubSurfDispMisle_Fixed_Small,hardpoint,Sub-Surface Displacement Missile,Fixed,Seeker,,1,B, -128915455,Hpt_Mining_SubSurfDispMisle_Turret_Small,hardpoint,Sub-Surface Displacement Missile,Turreted,Seeker,,1,B, -128915456,Hpt_Mining_SubSurfDispMisle_Fixed_Medium,hardpoint,Sub-Surface Displacement Missile,Fixed,Seeker,,2,B, -128915457,Hpt_Mining_SubSurfDispMisle_Turret_Medium,hardpoint,Sub-Surface Displacement Missile,Turreted,Seeker,,2,B, -128915458,Hpt_Mining_AbrBlstr_Fixed_Small,hardpoint,Abrasion Blaster,Fixed,,,1,D, -128915459,Hpt_Mining_AbrBlstr_Turret_Small,hardpoint,Abrasion Blaster,Turreted,,,1,D, -128915460,Hpt_Mining_SeismChrgWarhd_Fixed_Medium,hardpoint,Seismic Charge Launcher,Fixed,Seeker,,2,B, -128915461,Hpt_Mining_SeismChrgWarhd_Turret_Medium,hardpoint,Seismic Charge Launcher,Turreted,Seeker,,2,B, -128915718,Hpt_MRAScanner_Size0_Class1,utility,Pulse Wave Analyser,,,,0,E, -128915719,Hpt_MRAScanner_Size0_Class2,utility,Pulse Wave Analyser,,,,0,D, -128915720,Hpt_MRAScanner_Size0_Class3,utility,Pulse Wave Analyser,,,,0,C, -128915721,Hpt_MRAScanner_Size0_Class4,utility,Pulse Wave Analyser,,,,0,B, -128915722,Hpt_MRAScanner_Size0_Class5,utility,Pulse Wave Analyser,,,,0,A, -128915981,Mamba_Armour_Grade1,standard,Lightweight Alloy,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128915982,Mamba_Armour_Grade2,standard,Reinforced Alloy,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128915983,Mamba_Armour_Grade3,standard,Military Grade Composite,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128915984,Mamba_Armour_Mirrored,standard,Mirrored Surface Composite,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128915985,Mamba_Armour_Reactive,standard,Reactive Surface Composite,,,Mamba,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -128932273,Int_SupercruiseAssist,internal,Supercruise Assist,,,,1,E, -128935155,Int_DockingComputer_Advanced,internal,Advanced Docking Computer,,,,1,E, -128935980,Hpt_MultiCannon_Fixed_Medium_Advanced,hardpoint,Advanced Multi-Cannon,Fixed,,,2,E, -128935981,Hpt_MultiCannon_Fixed_Small_Advanced,hardpoint,Advanced Multi-Cannon,Fixed,,,1,F, -128935982,Hpt_DumbfireMissileRack_Fixed_Small_Advanced,hardpoint,Advanced Missile Rack,Fixed,Dumbfire,,1,B, -128935983,Hpt_DumbfireMissileRack_Fixed_Medium_Advanced,hardpoint,Advanced Missile Rack,Fixed,Dumbfire,,2,B, -128975719,Int_PlanetApproachSuite_Advanced,internal,Advanced Planetary Approach Suite,,,,1,I,ELITE_HORIZONS_V_PLANETARY_LANDINGS -129001921,Int_MultiDroneControl_Mining_Size3_Class1,internal,Mining Multi Limpet Controller,,,,3,E, -129001922,Int_MultiDroneControl_Mining_Size3_Class3,internal,Mining Multi Limpet Controller,,,,3,C, -129001923,Int_MultiDroneControl_Operations_Size3_Class3,internal,Operations Multi Limpet Controller,,,,3,C, -129001924,Int_MultiDroneControl_Operations_Size3_Class4,internal,Operations Multi Limpet Controller,,,,3,B, -129001925,Int_MultiDroneControl_Rescue_Size3_Class2,internal,Rescue Multi Limpet Controller,,,,3,D, -129001926,Int_MultiDroneControl_Rescue_Size3_Class3,internal,Rescue Multi Limpet Controller,,,,3,C, -129001927,Int_MultiDroneControl_Xeno_Size3_Class3,internal,Xeno Multi Limpet Controller,,,,3,C, -129001928,Int_MultiDroneControl_Xeno_Size3_Class4,internal,Xeno Multi Limpet Controller,,,,3,B, -129001929,Int_MultiDroneControl_Universal_Size7_Class3,internal,Universal Multi Limpet Controller,,,,7,C, -129001930,Int_MultiDroneControl_Universal_Size7_Class5,internal,Universal Multi Limpet Controller,,,,7,A, diff --git a/rare_commodity.csv b/rare_commodity.csv deleted file mode 100644 index d0d7397f..00000000 --- a/rare_commodity.csv +++ /dev/null @@ -1,143 +0,0 @@ -id,symbol,market_id,category,name -128666746,EraninPearlWhisky,128001536,Legal Drugs,Eranin Pearl Whisky -128666747,LavianBrandy,128106744,Legal Drugs,Lavian Brandy -128667019,HIP10175BushMeat,3223234816,Foods,HIP 10175 Bush Meat -128667020,AlbinoQuechuaMammoth,3222822912,Foods,Albino Quechua Mammoth Meat -128667021,UtgaroarMillenialEggs,128037120,Foods,Utgaroar Millennial Eggs -128667022,WitchhaulKobeBeef,3223358720,Foods,Witchhaul Kobe Beef -128667023,KarsukiLocusts,3225028096,Foods,Karsuki Locusts -128667024,GiantIrukamaSnails,3225345792,Foods,Giant Irukama Snails -128667025,BaltahSineVacuumKrill,128088056,Foods,Baltah'sine Vacuum Krill -128667026,CetiRabbits,3222560000,Foods,Ceti Rabbits -128667027,KachiriginLeaches,3221595648,Medicines,Kachirigin Filter Leeches -128667028,LyraeWeed,3226417152,Legal Drugs,Lyrae Weed -128667029,OnionHead,128129272,Legal Drugs,Onionhead -128667030,TarachTorSpice,128041984,Legal Drugs,Tarach Spice -128667031,Wolf1301Fesh,128084984,Legal Drugs,Wolf Fesh -128667032,BorasetaniPathogenetics,3229638400,Weapons,Borasetani Pathogenetics -128667033,HIP118311Swarm,3223177472,Weapons,HIP 118311 Swarm -128667034,KonggaAle,3226978048,Legal Drugs,Kongga Ale -128667035,WuthieloKuFroth,3222155776,Legal Drugs,Wuthielo Ku Froth -128667036,AlacarakmoSkinArt,3231373824,Consumer Items,Alacarakmo Skin Art -128667037,EleuThermals,3230624768,Consumer Items,Eleu Thermals -128667038,EshuUmbrellas,3222295552,Consumer Items,Eshu Umbrellas -128667039,KaretiiCouture,3227333120,Consumer Items,Karetii Couture -128667040,NjangariSaddles,3222416896,Consumer Items,Njangari Saddles -128667041,AnyNaCoffee,3229880064,Foods,Any Na Coffee -128667042,CD75CatCoffee,3228566016,Foods,CD-75 Kitten Brand Coffee -128667043,GomanYauponCoffee,3224449792,Foods,Goman Yaupon Coffee -128667044,VolkhabBeeDrones,3227831808,Machinery,Volkhab Bee Drones -128667045,KinagoInstruments,3227394304,Consumer Items,Kinago Violins -128667046,NgunaModernAntiques,3221538304,Consumer Items,Nguna Modern Antiques -128667047,RajukruStoves,3227512320,Consumer Items,Rajukru Multi-Stoves -128667048,TiolceWaste2PasteUnits,3224141312,Consumer Items,Tiolce Waste2Paste Units -128667049,ChiEridaniMarinePaste,128128760,Foods,Chi Eridani Marine Paste -128667050,EsusekuCaviar,3226919680,Foods,Esuseku Caviar -128667051,LiveHecateSeaWorms,128042496,Foods,Live Hecate Sea Worms -128667052,HelvetitjPearls,3231094528,Metals,Helvetitj Pearls -128667053,HIP41181Squid,3227995392,Foods,HIP Proto-Squid -128667054,CoquimSpongiformVictuals,3223832576,Foods,Coquim Spongiform Victuals -128667055,AerialEdenApple,128083448,Foods,Eden Apples of Aerial -128667056,NeritusBerries,3228206080,Foods,Neritus Berries -128667057,OchoengChillies,3226719232,Foods,Ochoeng Chillies -128667058,DeuringasTruffles,3229713408,Foods,Deuringas Truffles -128667059,HR7221Wheat,3226170880,Foods,HR 7221 Wheat -128667060,JarouaRice,3224698112,Foods,Jaroua Rice -128667061,BelalansRayLeather,3223537152,Textiles,Belalans Ray Leather -128667062,DamnaCarapaces,3227751936,Textiles,Damna Carapaces -128667063,RapaBaoSnakeSkins,3222875648,Textiles,Rapa Bao Snake Skins -128667064,VanayequiRhinoFur,3227289856,Textiles,Vanayequi Ceratomorpha Fur -128667065,BastSnakeGin,128086776,Legal Drugs,Bast Snake Gin -128667066,ThrutisCream,3226522368,Legal Drugs,Thrutis Cream -128667067,WulpaHyperboreSystems,3221388032,Machinery,Wulpa Hyperbore Systems -128667068,AganippeRush,128012800,Medicines,Aganippe Rush -128667069,TerraMaterBloodBores,128051466,Medicines,Terra Mater Blood Bores -128667070,HolvaDuellingBlades,3222713088,Weapons,Holva Duelling Blades -128667071,KamorinHistoricWeapons,3221669632,Weapons,Kamorin Historic Weapons -128667072,GilyaSignatureWeapons,3226857216,Weapons,Gilya Signature Weapons -128667073,DeltaPhoenicisPalms,128045312,Chemicals,Delta Phoenicis Palms -128667074,ToxandjiVirocide,3230258688,Chemicals,Toxandji Virocide -128667075,XiheCompanions,3224133120,Technology,Xihe Biomorphic Companions -128667076,SanumaMEAT,3230331136,Foods,Sanuma Decorative Meat -128667077,EthgrezeTeaBuds,3229524992,Foods,Ethgreze Tea Buds -128667078,CeremonialHeikeTea,3227417856,Foods,Ceremonial Heike Tea -128667079,TanmarkTranquilTea,128057866,Foods,Tanmark Tranquil Tea -128667080,AZCancriFormula42,3228400128,Technology,Az Cancri Formula 42 -128667081,KamitraCigars,3225450752,Legal Drugs,Kamitra Cigars -128667082,RusaniOldSmokey,3229255680,Legal Drugs,Rusani Old Smokey -128667083,YasoKondiLeaf,3223088640,Legal Drugs,Yaso Kondi Leaf -128667084,ChateauDeAegaeon,3228416768,Legal Drugs,Chateau De Aegaeon -128667085,WatersOfShintara,128666762,Medicines,The Waters of Shintara -128667668,OphiuchiExinoArtefacts,3228939264,Consumer Items,Ophiuch Exino Artefacts -128667669,BakedGreebles,3229378560,Foods,Baked Greebles -128667670,CetiAepyornisEgg,3222560256,Foods,Aepyornis Egg -128667671,SaxonWine,3227986432,Legal Drugs,Saxon Wine -128667672,CentauriMegaGin,3228728832,Legal Drugs,Centauri Mega Gin -128667673,AnduligaFireWorks,3230243584,Consumer Items,Anduliga Fire Works -128667674,BankiAmphibiousLeather,3228346112,Textiles,Banki Amphibious Leather -128667675,CherbonesBloodCrystals,3229594624,Metals,Cherbones Blood Crystals -128667676,MotronaExperienceJelly,3229750528,Legal Drugs,Motrona Experience Jelly -128667677,GeawenDanceDust,3230954752,Legal Drugs,Geawen Dance Dust -128667678,GerasianGueuzeBeer,3228047360,Legal Drugs,Gerasian Gueuze Beer -128667679,HaidneBlackBrew,3226557696,Foods,Haiden Black Brew -128667680,HavasupaiDreamCatcher,3221438976,Consumer Items,Havasupai Dream Catcher -128667681,BurnhamBileDistillate,3230224384,Legal Drugs,Burnham Bile Distillate -128667682,HIPOrganophosphates,3227036160,Chemicals,HIP Organophosphates -128667683,JaradharrePuzzlebox,3230754816,Consumer Items,Jaradharre Puzzle Box -128667684,KorroKungPellets,3228726272,Chemicals,Koro Kung Pellets -128667685,LFTVoidExtractCoffee,3229028864,Foods,Void Extract Coffee -128667686,HonestyPills,3229561344,Medicines,Honesty Pills -128667687,NonEuclidianExotanks,3224135424,Machinery,Non Euclidian Exotanks -128667688,LTTHyperSweet,3224166400,Foods,LTT Hyper Sweet -128667689,MechucosHighTea,3228398848,Foods,Mechucos High Tea -128667690,MedbStarlube,3228762368,Chemicals,Medb Starlube -128667691,MokojingBeastFeast,3229612800,Foods,Mokojing Beast Feast -128667692,MukusubiiChitinOs,3221719296,Foods,Mukusubii Chitin-os -128667693,MulachiGiantFungus,3228892672,Foods,Mulachi Giant Fungus -128667694,NgadandariFireOpals,3226127872,Metals,Ngadandari Fire Opals -128667695,TiegfriesSynthSilk,3227726848,Textiles,Tiegfries Synth Silk -128667696,UzumokuLowGWings,3226474496,Consumer Items,Uzumoku Low-G Wings -128667697,VHerculisBodyRub,3228959232,Medicines,V Herculis Body Rub -128667698,WheemeteWheatCakes,3225032704,Foods,Wheemete Wheat Cakes -128667699,VegaSlimWeed,128149240,Medicines,Vega Slimweed -128667700,AltairianSkin,128151032,Consumer Items,Altairian Skin -128667701,PavonisEarGrubs,128117240,Legal Drugs,Pavonis Ear Grubs -128667702,JotunMookah,128078840,Textiles,Jotun Mookah -128667703,GiantVerrix,128121336,Machinery,Giant Verrix -128667704,IndiBourbon,128118520,Legal Drugs,Indi Bourbon -128667705,AroucaConventualSweets,128098040,Foods,Arouca Conventual Sweets -128667706,TauriChimes,128134648,Consumer Items,Tauri Chimes -128667707,ZeesszeAntGlue,128125432,Consumer Items,Zeessze Ant Grub Glue -128667708,PantaaPrayerSticks,3228824064,Medicines,Pantaa Prayer Sticks -128667709,FujinTea,128134392,Foods,Fujin Tea -128667710,ChameleonCloth,3223418880,Textiles,Chameleon Cloth -128667711,OrrerianViciousBrew,128166392,Foods,Orrerian Vicious Brew -128667712,UszaianTreeGrub,128164856,Foods,Uszaian Tree Grub -128667713,MomusBogSpaniel,128075256,Consumer Items,Momus Bog Spaniel -128667714,DisoMaCorn,128161016,Foods,Diso Ma Corn -128667715,LeestianEvilJuice,128639992,Legal Drugs,Leestian Evil Juice -128667716,BlueMilk,128639992,Foods,Azure Milk -128667717,AlienEggs,128164088,Consumer Items,Leathery Eggs -128667718,AlyaBodilySoap,3221638400,Medicines,Alya Body Soap -128667719,VidavantianLace,3231082240,Consumer Items,Vidavantian Lace -128667760,TransgenicOnionHead,128057866,Legal Drugs,Lucan Onionhead -128668017,JaquesQuinentianStill,128667761,Consumer Items,Jaques Quinentian Still -128668018,SoontillRelics,3225348096,Consumer Items,Soontill Relics -128671119,Advert1,3227172352,Consumer Items,Ultra-Compact Processor Prototypes -128672121,TheHuttonMug,3228728832,Consumer Items,The Hutton Mug -128672122,SothisCrystallineGold,128668557,Metals,Sothis Crystalline Gold -128672316,MasterChefs,128123640,Slavery,Master Chefs -128672431,PersonalGifts,3223105792,Salvage,Personal Gifts -128672432,CrystallineSpheres,128059402,Salvage,Crystalline Spheres -128672812,OnionHeadA,3226977024,Legal Drugs,Onionhead Alpha Strain -128673069,OnionHeadB,3223027200,Legal Drugs,Onionhead Beta Strain -128682050,GalacticTravelGuide,128673074,Salvage,Galactic Travel Guide -128727921,AnimalEffigies,3228463360,Legal Drugs,Crom Silver Fesh -128732551,ShansCharisOrchid,128107768,Consumer Items,Shan's Charis Orchid -128748428,BuckyballBeerMats,128745551,Consumer Items,Buckyball Beer Mats -128793113,HarmaSilverSeaRum,3221575424,Legal Drugs,Harma Silver Sea Rum -128793114,PlatinumAloy,3223779840,Metals,Platinum Alloy -128913661,Nanomedicines,3226651904,Medicines,Nanomedicines -128922524,Duradrives,3223453184,Consumer Items,Duradrives -128958679,ApaVietii,128958681,Legal Drugs,Apa Vietii -129002574,ClassifiedExperimentalEquipment,128986325,Technology,Classified Experimental Equipment From 53835dd36872a6ef3127476ca5ee86462d43c74d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 17:03:58 +0000 Subject: [PATCH 414/527] build(deps-dev): bump setuptools from 60.8.2 to 60.9.1 Bumps [setuptools](https://github.com/pypa/setuptools) from 60.8.2 to 60.9.1. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v60.8.2...v60.9.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 88f68a80..7ae38247 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==60.8.2 +setuptools==60.9.1 # Static analysis tools flake8==4.0.1 From dc413cdf1a49bf78724e9c3340a2f9aa311f3141 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Feb 2022 17:47:54 +0000 Subject: [PATCH 415/527] develop: Bump appversion to 5.3.1-beta1 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 63505dac..1cbfb422 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.0' +_static_appversion = '5.3.1-beta1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 485ad394e60eb5e98e87811a59863c2c6719622a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 17:03:17 +0000 Subject: [PATCH 416/527] build(deps-dev): bump types-requests from 2.27.9 to 2.27.10 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.9 to 2.27.10. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a9c63292..e21f15bf 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.9 +types-requests==2.27.10 # Code formatting tools autopep8==1.6.0 From e95c96bac2c44aab75c0879e418cb0a838e67a9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 17:03:23 +0000 Subject: [PATCH 417/527] build(deps-dev): bump setuptools from 60.9.1 to 60.9.2 Bumps [setuptools](https://github.com/pypa/setuptools) from 60.9.1 to 60.9.2. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v60.9.1...v60.9.2) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a9c63292..3ce17d1e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==60.9.1 +setuptools==60.9.2 # Static analysis tools flake8==4.0.1 From 46a807deb1de88508b8a3793a84f9459af6f474b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 17 Feb 2022 12:17:20 +0000 Subject: [PATCH 418/527] PLUGINS: Call out keeping an eye on Discussions --- PLUGINS.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PLUGINS.md b/PLUGINS.md index 00072e18..b26ee58b 100644 --- a/PLUGINS.md +++ b/PLUGINS.md @@ -38,6 +38,8 @@ Please be sure to read the [Avoiding potential pitfalls](#avoiding-potential-pit section, else you might inadvertently cause issues for the core EDMarketConnector code including whole application crashes. +## Being aware of core application changes + It is highly advisable to ensure you are aware of all EDMarketConnector releases, including the pre-releases. The -beta and -rc changelogs will contain valuable information about any forthcoming changes that affect plugins. @@ -55,6 +57,11 @@ The easiest way is: And, of course, either ensure you check your GitHub messages regularly, or have it set up to email you such notifications. +You should also keep an eye on [our GitHub Discussions](https://github.com/EDCD/EDMarketConnector/discussions) +in case there are any proposed changes to EDMC plugin functionality. You can +do this by ensuring 'Discussions' is also ticked when following the steps +above to set up a 'Custom' watch on this repository. + --- ## Examples From 7116964dba805f39ef28ec0a73b30202524f803e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 17 Feb 2022 12:17:20 +0000 Subject: [PATCH 419/527] PLUGINS: Call out keeping an eye on Discussions --- PLUGINS.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PLUGINS.md b/PLUGINS.md index 00072e18..b26ee58b 100644 --- a/PLUGINS.md +++ b/PLUGINS.md @@ -38,6 +38,8 @@ Please be sure to read the [Avoiding potential pitfalls](#avoiding-potential-pit section, else you might inadvertently cause issues for the core EDMarketConnector code including whole application crashes. +## Being aware of core application changes + It is highly advisable to ensure you are aware of all EDMarketConnector releases, including the pre-releases. The -beta and -rc changelogs will contain valuable information about any forthcoming changes that affect plugins. @@ -55,6 +57,11 @@ The easiest way is: And, of course, either ensure you check your GitHub messages regularly, or have it set up to email you such notifications. +You should also keep an eye on [our GitHub Discussions](https://github.com/EDCD/EDMarketConnector/discussions) +in case there are any proposed changes to EDMC plugin functionality. You can +do this by ensuring 'Discussions' is also ticked when following the steps +above to set up a 'Custom' watch on this repository. + --- ## Examples From 7e4ffcf1efc2f49ad48638ff86f915759ffd9803 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 17:05:42 +0000 Subject: [PATCH 420/527] build(deps-dev): bump lxml from 4.7.1 to 4.8.0 Bumps [lxml](https://github.com/lxml/lxml) from 4.7.1 to 4.8.0. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](https://github.com/lxml/lxml/compare/lxml-4.7.1...lxml-4.8.0) --- updated-dependencies: - dependency-name: lxml dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 4d7b97e0..3b9fd462 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ grip==4.6.0 # Packaging # Used to put together a WiX configuration from template/auto-gen -lxml==4.7.1 +lxml==4.8.0 # We only need py2exe on windows. # Pre-release version addressing semantic_version 2.9.0+ issues: # From e51aba1cc366aa212610349c82518f8095fe88b2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Feb 2022 15:23:27 +0000 Subject: [PATCH 421/527] EDDN: Handle ApproachSettlement missing planetary coords --- plugins/eddn.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 1c3fdc43..d5db6e8d 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1126,6 +1126,27 @@ class EDDN: # "event": "ApproachSettlement", # "timestamp": "2021-10-14T12:37:54Z" # } + + ####################################################################### + # Bugs + ####################################################################### + # WORKAROUND 3.8.0.404 | 2022-02-18: ApproachSettlement missing coords + # As of Horizons ("gameversion":"3.8.0.404", "build":"r280105/r0 ") + # if you log back in (certainly a game client restart) at a + # Planetary Port, then the ApproachSettlement event written will be + # missing the Latitude and Longitude. + # Ref: https://github.com/EDCD/EDMarketConnector/issues/1476 + if any( + k not in entry for k in ('Latitude', 'Longitude') + ): + logger.debug( + f'ApproachSettlement without at least one of Latitude or Longitude:\n{entry}\n' + ) + # No need to alert the user, it will only annoy them + return "" + # WORKAROUND END + ####################################################################### + ####################################################################### # Augmentations ####################################################################### From 0844b3f8e6bee56340b415896f340de834f2e52a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 17:04:14 +0000 Subject: [PATCH 422/527] build(deps-dev): bump setuptools from 60.9.2 to 60.9.3 Bumps [setuptools](https://github.com/pypa/setuptools) from 60.9.2 to 60.9.3. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v60.9.2...v60.9.3) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3b9fd462..abeab851 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==60.9.2 +setuptools==60.9.3 # Static analysis tools flake8==4.0.1 From 10977ccb07e9dac2e839eaa6cce3f1c3c56b7361 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 19 Feb 2022 11:15:06 +0000 Subject: [PATCH 423/527] Prevent plugin widget code issues from breaking theme changes This adds a try/except around a bunch of .configure() calls on widgets. Yes, sure, this could then leave the widget in question in a broken state, but at least our entire UI won't fall flat on its face. --- theme.py | 105 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/theme.py b/theme.py index 8515bfbb..eea1072a 100644 --- a/theme.py +++ b/theme.py @@ -14,6 +14,9 @@ from tkinter import ttk from config import config from ttkHyperlinkLabel import HyperlinkLabel +from EDMCLogging import get_main_logger + +logger = get_main_logger() if __debug__: from traceback import print_exc @@ -266,50 +269,64 @@ class _Theme(object): widget.winfo_class(), widget, 'text' in widget.keys() and widget['text']) attribs = self.widgets.get(widget, []) - if isinstance(widget, tk.BitmapImage): - # not a widget - if 'fg' not in attribs: - widget.configure(foreground=self.current['foreground']), - if 'bg' not in attribs: - widget.configure(background=self.current['background']) - elif 'cursor' in widget.keys() and str(widget['cursor']) not in ['', 'arrow']: - # Hack - highlight widgets like HyperlinkLabel with a non-default cursor - if 'fg' not in attribs: - widget.configure(foreground=self.current['highlight']), - if 'insertbackground' in widget.keys(): # tk.Entry - widget.configure(insertbackground=self.current['foreground']), - if 'bg' not in attribs: - widget.configure(background=self.current['background']) - if 'highlightbackground' in widget.keys(): # tk.Entry - widget.configure(highlightbackground=self.current['background']) - if 'font' not in attribs: - widget.configure(font=self.current['font']) - elif 'activeforeground' in widget.keys(): - # e.g. tk.Button, tk.Label, tk.Menu - if 'fg' not in attribs: - widget.configure(foreground=self.current['foreground'], - activeforeground=self.current['activeforeground'], - disabledforeground=self.current['disabledforeground']) - if 'bg' not in attribs: - widget.configure(background=self.current['background'], - activebackground=self.current['activebackground']) - if sys.platform == 'darwin' and isinstance(widget, tk.Button): - widget.configure(highlightbackground=self.current['background']) - if 'font' not in attribs: - widget.configure(font=self.current['font']) - elif 'foreground' in widget.keys(): - # e.g. ttk.Label - if 'fg' not in attribs: - widget.configure(foreground=self.current['foreground']), - if 'bg' not in attribs: - widget.configure(background=self.current['background']) - if 'font' not in attribs: - widget.configure(font=self.current['font']) - elif 'background' in widget.keys() or isinstance(widget, tk.Canvas): - # e.g. Frame, Canvas - if 'bg' not in attribs: - widget.configure(background=self.current['background'], - highlightbackground=self.current['disabledforeground']) + try: + if isinstance(widget, tk.BitmapImage): + # not a widget + if 'fg' not in attribs: + widget.configure(foreground=self.current['foreground']), + + if 'bg' not in attribs: + widget.configure(background=self.current['background']) + + elif 'cursor' in widget.keys() and str(widget['cursor']) not in ['', 'arrow']: + # Hack - highlight widgets like HyperlinkLabel with a non-default cursor + if 'fg' not in attribs: + widget.configure(foreground=self.current['highlight']), + if 'insertbackground' in widget.keys(): # tk.Entry + widget.configure(insertbackground=self.current['foreground']), + + if 'bg' not in attribs: + widget.configure(background=self.current['background']) + if 'highlightbackground' in widget.keys(): # tk.Entry + widget.configure(highlightbackground=self.current['background']) + + if 'font' not in attribs: + widget.configure(font=self.current['font']) + + elif 'activeforeground' in widget.keys(): + # e.g. tk.Button, tk.Label, tk.Menu + if 'fg' not in attribs: + widget.configure(foreground=self.current['foreground'], + activeforeground=self.current['activeforeground'], + disabledforeground=self.current['disabledforeground']) + + if 'bg' not in attribs: + widget.configure(background=self.current['background'], + activebackground=self.current['activebackground']) + if sys.platform == 'darwin' and isinstance(widget, tk.Button): + widget.configure(highlightbackground=self.current['background']) + + if 'font' not in attribs: + widget.configure(font=self.current['font']) + elif 'foreground' in widget.keys(): + # e.g. ttk.Label + if 'fg' not in attribs: + widget.configure(foreground=self.current['foreground']), + + if 'bg' not in attribs: + widget.configure(background=self.current['background']) + + if 'font' not in attribs: + widget.configure(font=self.current['font']) + + elif 'background' in widget.keys() or isinstance(widget, tk.Canvas): + # e.g. Frame, Canvas + if 'bg' not in attribs: + widget.configure(background=self.current['background'], + highlightbackground=self.current['disabledforeground']) + + except Exception: + logger.exception('Plugin widget issue ?') # Apply configured theme From 17530c2d2b56e13939f0a710d72d45dbb32b7d26 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 19 Feb 2022 11:48:27 +0000 Subject: [PATCH 424/527] theme.py: Log widget if exception is thrown --- theme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme.py b/theme.py index eea1072a..ce9318bd 100644 --- a/theme.py +++ b/theme.py @@ -326,7 +326,7 @@ class _Theme(object): highlightbackground=self.current['disabledforeground']) except Exception: - logger.exception('Plugin widget issue ?') + logger.exception(f'Plugin widget issue ? {widget=}') # Apply configured theme From 520ff5868fddd339c10a80800c242f6ef8ff3cc4 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 20 Feb 2022 19:05:41 +0000 Subject: [PATCH 425/527] theme.py: Apply .configure() paranoia on button enter/leave --- theme.py | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/theme.py b/theme.py index ce9318bd..4f60f976 100644 --- a/theme.py +++ b/theme.py @@ -195,17 +195,35 @@ class _Theme(object): def _enter(self, event, image): widget = event.widget if widget and widget['state'] != tk.DISABLED: - widget.configure(state=tk.ACTIVE) + try: + widget.configure(state=tk.ACTIVE) + + except Exception: + logger.exception(f'Failure setting widget active: {widget=}') + if image: - image.configure(foreground=self.current['activeforeground'], - background=self.current['activebackground']) + try: + image.configure(foreground=self.current['activeforeground'], + background=self.current['activebackground']) + + except Exception: + logger.exception(f'Failure configuring image: {image=}') def _leave(self, event, image): widget = event.widget if widget and widget['state'] != tk.DISABLED: - widget.configure(state=tk.NORMAL) + try: + widget.configure(state=tk.NORMAL) + + except Exception: + logger.exception(f'Failure setting widget normal: {widget=}') + if image: - image.configure(foreground=self.current['foreground'], background=self.current['background']) + try: + image.configure(foreground=self.current['foreground'], background=self.current['background']) + + except Exception: + logger.exception(f'Failure configuring image: {image=}') # Set up colors def _colors(self, root, theme): From de69b95b8a90505a2a99fda716ae7e3f530d0c75 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 20 Feb 2022 19:18:34 +0000 Subject: [PATCH 426/527] EDDN: codexentry/1: Tighten up 'empty string' checks It turns out some of the other strings, that do not have minLength=1 in the schema, can be empty and that's OK. i.e. NearestDestination. So, let's only check for the actual minLength=1 things. Which is a few top-level key:values, and then the contents of the Traits array. --- plugins/eddn.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index d5db6e8d..d82abc13 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -970,7 +970,9 @@ class EDDN: logger.warning(f'this.body_id was not set properly: "{this.body_id}" ({type(this.body_id)})') ####################################################################### - for k, v in entry.items(): + # Check just the top-level strings with minLength=1 in the schema + for k in ('System', 'Name', 'Region', 'Category', 'SubCategory'): + v = entry[k] if v is None or isinstance(v, str) and v == '': logger.warning(f'post-processing entry contains entry["{k}"] = {v} {(type(v))}') # We should drop this message and VERY LOUDLY inform the @@ -978,6 +980,13 @@ class EDDN: # raw Journal event that caused this. return 'CodexEntry had empty string, PLEASE ALERT THE EDMC DEVELOPERS' + # Also check traits + if 'Traits' in entry: + for v in entry['Traits']: + if v is None or isinstance(v, str) and v == '': + logger.warning(f'post-processing entry[\'Traits\'] contains {v} {(type(v))}\n{entry["Traits"]}\n') + return 'CodexEntry Trait had empty string, PLEASE ALERT THE EDMC DEVELOPERS' + msg = { '$schemaRef': f'https://eddn.edcd.io/schemas/codexentry/1{"/test" if is_beta else ""}', 'message': entry From 6f8847e3e10c186e5f75b5240fa2f29ee3e3b835 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 20 Feb 2022 19:30:45 +0000 Subject: [PATCH 427/527] EDDN: approachsettlement/1: Don't claim `entry_augment_system_data()` as only for us --- plugins/eddn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index d5db6e8d..8ee20acd 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -829,7 +829,7 @@ class EDDN: else: logger.warning("Neither this_coordinates or this.coordinates set, can't add StarPos") - return 'No source for adding StarPos to approachsettlement/1 !' + return 'No source for adding StarPos to EDDN message !' return entry From 562a224857c887b170a5d817f4bee64ec1db0583 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 20 Feb 2022 19:44:53 +0000 Subject: [PATCH 428/527] EDDN: approachsettlement/1: Bail if no System (name) yet * A login-time `ApproachSettlement` happens before `Location`, if appropriate. * Also add a future comment about FSSSignalDiscovered, for if EDDN ever adds the schema. --- plugins/eddn.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 8ee20acd..b381a761 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1520,6 +1520,12 @@ def journal_entry( # noqa: C901, CCR001 return this.eddn.export_journal_navroute(cmdr, is_beta, entry) elif event_name == 'approachsettlement': + # An `ApproachSettlement` can appear *before* `Location` if you + # logged at one. We won't have necessary augmentation data + # at this point, so bail. + if system is None: + return "" + return this.eddn.export_journal_approachsettlement( cmdr, system, @@ -1528,6 +1534,14 @@ def journal_entry( # noqa: C901, CCR001 entry ) + # NB: If adding FSSSignalDiscovered these absolutely come in at login + # time **BEFORE** the `Location` event, so we won't yet know things + # like SystemNane, or StarPos. + # We can either have the "now send the batch" code add such (but + # that has corner cases around changing systems in the meantime), + # drop those events, or if the schema allows, send without those + # augmentations. + elif event_name == 'fssallbodiesfound': return this.eddn.export_journal_fssallbodiesfound( cmdr, From 24e8912756f64e08e77efc29a83bd797f3063729 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 21 Feb 2022 12:26:42 +0000 Subject: [PATCH 429/527] Release 5.3.1: appversion and ChangeLog --- ChangeLog.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ config/__init__.py | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index ca5ad793..d8f721e3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,51 @@ produce the Windows executables and installer. --- +Release 5.3.1 +=== + +This release addresses some issues with newer EDDN code which could cause +erroneous alerts to the player, or sending of bad messages. + +* EDDN: Cope with `ApproachSettlement` on login occurring before `Location`, + such that we don't yet know the name of the star system the player is in. + + Closes [#1484](https://github.com/EDCD/EDMarketConnector/pull/1484) + +* EDDN: Cope with `ApproachSettlement` missing planetary coordinates on login + at/near a settlement in Horizons. + + Closes [#1476](https://github.com/EDCD/EDMarketConnector/pull/1476) + +* EDDN: Change the `CodexEntry` "empty string" checks to only apply to those + values where the schema enforces "must be at least one character". + + This prevents the big 'CodexEntry had empty string, PLEASE ALERT THE EDMC + DEVELOPERS' message from triggering on, e.g. `NearestDestination` being + empty, which the schema allows. + + Closes [#1481](https://github.com/EDCD/EDMarketConnector/issues/1481) + +Plugin Developers +--- + +* If you use a sub-class for a widget the core code will no longer break if + your code raises an exception. e.g. a plugin was failing due to Python + 3.10 using `collections.abc` instead of `collections`, and the plugin's + custom widget had a `configure()` method which was called by the core + theme code on startup or theme change. This then caused the whole + application UI to never show up on startup. + + This also applies if you set up a button such that enter/leave on it, i.e. + mouse in/out, causes the `theme.py` code for that to trigger. + + So, now in such cases the main UI should actually show up, although your + plugin's UI might look weird due to theming not being properly applied. + + The plugin exception **WILL** be logged, at ERROR level. + +--- + Release 5.3.0 === diff --git a/config/__init__.py b/config/__init__.py index 1cbfb422..0307386e 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.1-beta1' +_static_appversion = '5.3.1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From d8c58e2fd9251466a8619a049b4dff6f016c6e5b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 21 Feb 2022 12:36:42 +0000 Subject: [PATCH 430/527] develop: post-release version bump --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 0307386e..5d9cac1b 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.1' +_static_appversion = '5.3.2-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 992c293d64d61718c23830ea4f8a9f588efa5329 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:05:02 +0000 Subject: [PATCH 431/527] build(deps-dev): bump coverage[toml] from 6.3.1 to 6.3.2 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.3.1 to 6.3.2. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.3.1...6.3.2) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index abeab851..9e615c4e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -42,7 +42,7 @@ py2exe==0.11.1.0; sys_platform == 'win32' # Testing pytest==7.0.1 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.3.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.3.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==303; sys_platform == 'win32' From d4c6f4bfd68176d7e2a74b9106addc4328829587 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 17:04:00 +0000 Subject: [PATCH 432/527] build(deps-dev): bump types-requests from 2.27.10 to 2.27.11 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.10 to 2.27.11. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9e615c4e..d6d43873 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.10 +types-requests==2.27.11 # Code formatting tools autopep8==1.6.0 From 49721e6e9409039cde824f6711b91fdcab20a15f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 17:04:24 +0000 Subject: [PATCH 433/527] build(deps-dev): bump flake8-annotations-coverage from 0.0.5 to 0.0.6 Bumps [flake8-annotations-coverage](https://github.com/best-doctor/flake8-annotations-coverage) from 0.0.5 to 0.0.6. - [Release notes](https://github.com/best-doctor/flake8-annotations-coverage/releases) - [Commits](https://github.com/best-doctor/flake8-annotations-coverage/compare/v0.0.5...v0.0.6) --- updated-dependencies: - dependency-name: flake8-annotations-coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d6d43873..154c5e0f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,7 +9,7 @@ setuptools==60.9.3 # Static analysis tools flake8==4.0.1 -flake8-annotations-coverage==0.0.5 +flake8-annotations-coverage==0.0.6 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.8.0 flake8-docstrings==1.6.0 From 918d924612e7e860f916d944113a37cc0ffed5a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 17:05:03 +0000 Subject: [PATCH 434/527] build(deps): bump actions/setup-python from 2.3.2 to 3 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.2 to 3. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.3.2...v3) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index cbe187a3..2fd8727e 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -53,7 +53,7 @@ jobs: # Get Python set up #################################################################### - name: Set up Python 3.10 - uses: actions/setup-python@v2.3.2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 100e2363..d4b11afb 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python 3.10 - uses: actions/setup-python@v2.3.2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 9aaea7e6..fcbeaff9 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -20,7 +20,7 @@ jobs: with: submodules: true - - uses: actions/setup-python@v2.3.2 + - uses: actions/setup-python@v3 with: python-version: "3.10.2" architecture: "x86" From 4ea1609f36df43dfbd5c0c552205ede0ee081cd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 17:04:05 +0000 Subject: [PATCH 435/527] build(deps): bump actions/checkout from 2.4.0 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/submodule-update.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index cbe187a3..ebee843f 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -28,7 +28,7 @@ jobs: # based on. - name: Checkout head commits # https://github.com/actions/checkout - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v3 #with: #ref: ${{github.head.sha}} #repository: ${{github.event.pull_request.head.repo.full_name}} diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 100e2363..19d1157c 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python 3.10 diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 09562e1f..8ed83d31 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -17,7 +17,7 @@ jobs: OWNER: 'EDCD' steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: submodules: true diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 9aaea7e6..33c529cf 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -16,7 +16,7 @@ jobs: shell: powershell steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: submodules: true From 0d18d02a22b402971dd299a01755b09089e481fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 17:04:54 +0000 Subject: [PATCH 436/527] build(deps-dev): bump types-requests from 2.27.11 to 2.27.12 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.11 to 2.27.12. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 154c5e0f..76f445d5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.11 +types-requests==2.27.12 # Code formatting tools autopep8==1.6.0 From aaa9bc7ebf3e441ee2e4bdac0681183ede53840c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 17:05:00 +0000 Subject: [PATCH 437/527] build(deps-dev): bump pytest from 7.0.1 to 7.1.0 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.0.1 to 7.1.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.0.1...7.1.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 154c5e0f..cb0a1e0f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -40,7 +40,7 @@ lxml==4.8.0 py2exe==0.11.1.0; sys_platform == 'win32' # Testing -pytest==7.0.1 +pytest==7.1.0 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.3.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. From e17a40aaff7ece37fc9869e79c3b9ccae5331fbd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Mar 2022 13:56:48 +0000 Subject: [PATCH 438/527] monitor: Change Journal file regex, because Frontier are being a PITA They've changed it to an ISO8601 style full date/time now. But the Odyssey client still uses the old format. --- monitor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index b271b0c3..dc3a12e5 100644 --- a/monitor.py +++ b/monitor.py @@ -80,7 +80,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below _POLL = 1 # Polling is cheap, so do it often _RE_CANONICALISE = re.compile(r'\$(.+)_name;') _RE_CATEGORY = re.compile(r'\$MICRORESOURCE_CATEGORY_(.+);') - _RE_LOGFILE = re.compile(r'^Journal(Alpha|Beta)?\.[0-9]{12}\.[0-9]{2}\.log$') + _RE_LOGFILE = re.compile(r'^Journal(Alpha|Beta)?\.[0-9]{2,4}(-)?[0-9]{2}(-)?[0-9]{2}(T)?[0-9]{2}[0-9]{2}[0-9]{2}' + r'\.[0-9]{2}\.log$') _RE_SHIP_ONFOOT = re.compile(r'^(FlightSuit|UtilitySuit_Class.|TacticalSuit_Class.|ExplorationSuit_Class.)$') def __init__(self) -> None: From b60130266e849e20bde422c6cc02a1d5ee139af6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Mar 2022 13:58:38 +0000 Subject: [PATCH 439/527] Release 5.3.2: appversion & changelog --- ChangeLog.md | 6 ++++++ config/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index d8f721e3..572acd67 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,12 @@ produce the Windows executables and installer. --- +Release 5.3.2 +=== + +This release contains one change to cope with how Frontier decided to name +the Journal files differently in the Update 11 Odyssey client. + Release 5.3.1 === diff --git a/config/__init__.py b/config/__init__.py index 5d9cac1b..2e8b044d 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.2-beta0' +_static_appversion = '5.3.2' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 0ffff544f7d3a9f09fb9b12d523e374fdcf41a51 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Mar 2022 14:15:00 +0000 Subject: [PATCH 440/527] develop: post-release version bump to 5.3.3-beta0 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 2e8b044d..e69a7a11 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.2' +_static_appversion = '5.3.3-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 04930c59ac1cdc27529ef1a81659de278870b319 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Mar 2022 16:08:18 +0000 Subject: [PATCH 441/527] monitor: Properly determine *newest* Journal file Using os.path.getctime for the order, not the filename. This addresses the changed Journal filenames in Odyssey Update 11, whilst keeping compatibility with the Horizons Update 11 old-name-style filenames. --- monitor.py | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/monitor.py b/monitor.py index dc3a12e5..2eee38e2 100644 --- a/monitor.py +++ b/monitor.py @@ -12,7 +12,7 @@ import threading from calendar import timegm from collections import OrderedDict, defaultdict from os import SEEK_END, SEEK_SET, listdir -from os.path import basename, expanduser, isdir, join +from os.path import basename, expanduser, getctime, isdir, join from time import gmtime, localtime, mktime, sleep, strftime, strptime, time from typing import TYPE_CHECKING, Any, BinaryIO, Dict, List, MutableMapping, Optional from typing import OrderedDict as OrderedDictT @@ -215,15 +215,10 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.currentdir = logdir - # Latest pre-existing logfile - e.g. if E:D is already running. Assumes logs sort alphabetically. + # Latest pre-existing logfile - e.g. if E:D is already running. # Do this before setting up the observer in case the journal directory has gone away try: # TODO: This should be replaced with something specific ONLY wrapping listdir - logfiles = sorted( - (x for x in listdir(self.currentdir) if self._RE_LOGFILE.search(x)), - key=lambda x: x.split('.')[1:] - ) - - self.logfile = join(self.currentdir, logfiles[-1]) if logfiles else None # type: ignore + self.logfile = self.journal_newest_filename(self.currentdir) except Exception: logger.exception('Failed to find latest logfile') @@ -266,6 +261,24 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below logger.debug('Done.') return True + def journal_newest_filename(self, journals_dir) -> Optional[str]: + """ + Determine the newest Journal file name. + + :param journals_dir: The directory to check + :return: The `str` form of the full path to the newest Journal file + """ + journal_files = (x for x in listdir(journals_dir) if self._RE_LOGFILE.search(x)) + if journal_files: + # Odyssey Update 11 has, e.g. Journal.2022-03-15T152503.01.log + # Horizons Update 11 equivalent: Journal.220315152335.01.log + # So we can no longer use a naive sort. + journals_dir_path = pathlib.Path(journals_dir) + journal_files = (journals_dir_path / pathlib.Path(x) for x in journal_files) + return str(max(journal_files, key=getctime)) + + return None + def stop(self) -> None: """Stop journal monitoring.""" logger.debug('Stopping monitoring Journal') @@ -417,20 +430,15 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below # Check whether new log file started, e.g. client (re)started. if emitter and emitter.is_alive(): - newlogfile = self.logfile # updated by on_created watchdog callback + new_journal_file = self.logfile # updated by on_created watchdog callback else: # Poll try: - logfiles = sorted( - (x for x in listdir(self.currentdir) if self._RE_LOGFILE.search(x)), - key=lambda x: x.split('.')[1:] - ) - - newlogfile = join(self.currentdir, logfiles[-1]) if logfiles else None # type: ignore + new_journal_file = self.journal_newest_filename(self.currentdir) except Exception: logger.exception('Failed to find latest logfile') - newlogfile = None + new_journal_file = None if logfile: loghandle.seek(0, SEEK_END) # required to make macOS notice log change over SMB @@ -456,11 +464,11 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below log_pos = loghandle.tell() - if logfile != newlogfile: + if logfile != new_journal_file: for _ in range(10): logger.trace_if('journal.file', "****") - logger.info(f'New Journal File. Was "{logfile}", now "{newlogfile}"') - logfile = newlogfile + logger.info(f'New Journal File. Was "{logfile}", now "{new_journal_file}"') + logfile = new_journal_file if loghandle: loghandle.close() From 8104a71eada835db77f7e7526f9a587d3f512cca Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Mar 2022 16:20:33 +0000 Subject: [PATCH 442/527] Release 5.3.3: appversion & changelog --- ChangeLog.md | 15 +++++++++++++++ config/__init__.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 572acd67..36d42dab 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,21 @@ produce the Windows executables and installer. --- +Release 5.3.3 +=== + +Unfortunately 5.3.2 failed to fully address the issues caused by the different +Journal filenames when using the Odyssey Update 11 client. It's fine if you +run EDMarketConnector first and *then* the game, as the code path that detects +a new file always does just that. + +But the code for EDMarketConnector startup to find the current newest Journal +file relied on sorting the filenames and that would mean the new-style names +would always sort as 'oldest'. + +This release fixes that code to properly use the file modification timestamp +to determine the newest file on startup. + Release 5.3.2 === diff --git a/config/__init__.py b/config/__init__.py index e69a7a11..dacb7ce6 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.3-beta0' +_static_appversion = '5.3.3' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From ea716f406259f229a585740a7bd46e5d5218c2b5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 15 Mar 2022 16:47:41 +0000 Subject: [PATCH 443/527] develop: post-release version bump to 5.3.4-beta0 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index dacb7ce6..24299124 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.3' +_static_appversion = '5.3.4-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 1c197a34b95b1116fa71351cd8ed156c27951cb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Mar 2022 17:05:23 +0000 Subject: [PATCH 444/527] build(deps-dev): bump mypy from 0.931 to 0.941 Bumps [mypy](https://github.com/python/mypy) from 0.931 to 0.941. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.931...v0.941) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 154c5e0f..28c134d2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,7 +20,7 @@ flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.931 +mypy==0.941 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.27.11 From 66f09bdad2d36193f7e577dd43faea00e5b97fb2 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 16 Mar 2022 16:56:55 +0000 Subject: [PATCH 445/527] python: Bump up to v3.10.3 --- .github/workflows/windows-build.yml | 2 +- .python-version | 2 +- ChangeLog.md | 4 +++- docs/Releasing.md | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 6f8aa2a4..dd0dd026 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v3 with: - python-version: "3.10.2" + python-version: "3.10.3" architecture: "x86" - name: Install python tools diff --git a/.python-version b/.python-version index 7b59a5ca..7d4ef04f 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.2 +3.10.3 diff --git a/ChangeLog.md b/ChangeLog.md index 36d42dab..b3c09975 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.10.2. +* We now test against, and package with, Python 3.10.3. **As a consequence of this we no longer support Windows 7. This is due to @@ -27,6 +27,8 @@ produce the Windows executables and installer. --- +* We now test against, and package with, Python 3.10.3. + Release 5.3.3 === diff --git a/docs/Releasing.md b/docs/Releasing.md index d311c85a..2756f2fe 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -40,8 +40,8 @@ You will need several pieces of software installed, or the files from their auto-select some others). NB: If you have need to uninstall this it's "Windows Software Development Kit - Windows 10.0.19041.1" in "Apps & Features", *not* "Windows SDK AddOn". -1. [Python](https://python.org): 32-bit version of Python 3.9 for Windows. - [v3.9.5](https://www.python.org/downloads/release/python-395/) is the most +1. [Python](https://python.org): 32-bit version of Python 3.10 for Windows. + [v3.10.3](https://www.python.org/downloads/release/python-3103/) is the most recently tested version. You need the `Windows x86 executable installer` file, for the 32-bit version. Double-check the version against the `.python.version` file, as it should always contain the intended version. From f81ddddeedb265beb43c21a207a101b92af00d52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Mar 2022 17:07:42 +0000 Subject: [PATCH 446/527] build(deps-dev): bump types-requests from 2.27.12 to 2.27.13 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.12 to 2.27.13. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d49bb1f7..de7cc10d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.941 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.12 +types-requests==2.27.13 # Code formatting tools autopep8==1.6.0 From 221d15e54f4992717da17d235ff651ab10761e57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Mar 2022 17:07:55 +0000 Subject: [PATCH 447/527] build(deps-dev): bump setuptools from 60.9.3 to 60.10.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 60.9.3 to 60.10.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v60.9.3...v60.10.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d49bb1f7..f57ca129 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==60.9.3 +setuptools==60.10.0 # Static analysis tools flake8==4.0.1 From 43bae134182d615f0a424beb66917ecbe5b838d8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Mar 2022 09:42:04 +0000 Subject: [PATCH 448/527] EDMC.py: Use monitor.journal_newest_filename() --- EDMC.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/EDMC.py b/EDMC.py index 6c7163d7..ed36dfba 100755 --- a/EDMC.py +++ b/EDMC.py @@ -7,9 +7,8 @@ import json import locale import os import queue -import re import sys -from os.path import getmtime, join +from os.path import getmtime from time import sleep, time from typing import TYPE_CHECKING, Any, List, Optional @@ -65,8 +64,6 @@ l10n.Translations.install_dummy() SERVER_RETRY = 5 # retry pause for Companion servers [s] EXIT_SUCCESS, EXIT_SERVER, EXIT_CREDENTIALS, EXIT_VERIFICATION, EXIT_LAGGING, EXIT_SYS_ERR, EXIT_ARGS = range(7) -JOURNAL_RE = re.compile(r'^Journal(Beta)?\.[0-9]{12}\.[0-9]{2}\.log$') - def versioncmp(versionstring) -> List: """Quick and dirty version comparison assuming "strict" numeric only version numbers.""" @@ -225,10 +222,7 @@ sys.path: {sys.path}''' monitor.currentdir = config.default_journal_dir logger.debug(f'logdir = "{monitor.currentdir}"') - logfiles = sorted((x for x in os.listdir(monitor.currentdir) if JOURNAL_RE.search(x)), - key=lambda x: x.split('.')[1:]) - - logfile = join(monitor.currentdir, logfiles[-1]) + logfile = monitor.journal_newest_filename(monitor.currentdir) logger.debug(f'Using logfile "{logfile}"') with open(logfile, 'r', encoding='utf-8') as loghandle: From 4b12a6c48469c1120a484a20a279d2291752dd32 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Mar 2022 09:46:35 +0000 Subject: [PATCH 449/527] monitor: Properly type new_journal_file Python was guessing and not allowing 'None', which it will be at shutdown if this code triggers. --- monitor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index 2eee38e2..4451a5b4 100644 --- a/monitor.py +++ b/monitor.py @@ -430,7 +430,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below # Check whether new log file started, e.g. client (re)started. if emitter and emitter.is_alive(): - new_journal_file = self.logfile # updated by on_created watchdog callback + new_journal_file: Optional[str] = self.logfile # updated by on_created watchdog callback + else: # Poll try: From c89548c2ba41e5a591fe906baa341f0837923f66 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Mar 2022 09:49:02 +0000 Subject: [PATCH 450/527] monitor: journal_newest_filename(): Check for None directory os.listdir(None) operates on '.', which is wrong in this context, so be sure to avoid that. --- monitor.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/monitor.py b/monitor.py index 4451a5b4..ea54d33f 100644 --- a/monitor.py +++ b/monitor.py @@ -268,6 +268,10 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below :param journals_dir: The directory to check :return: The `str` form of the full path to the newest Journal file """ + # os.listdir(None) returns CWD's contents + if journals_dir is None: + return None + journal_files = (x for x in listdir(journals_dir) if self._RE_LOGFILE.search(x)) if journal_files: # Odyssey Update 11 has, e.g. Journal.2022-03-15T152503.01.log From 9f08b003c51c57ec16f23b1ea9860aeb1c681090 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Mar 2022 09:51:35 +0000 Subject: [PATCH 451/527] monitor: __navroute_retry(): be less noisy No need to log at INFO for the retry counts, as this appears to be working, make it DEBUG instead. This was making the EDMC.py output needlessly noisy. --- monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index ea54d33f..dd388875 100644 --- a/monitor.py +++ b/monitor.py @@ -2236,7 +2236,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below if self._navroute_retries_remaining == 0: return False - logger.info(f'Navroute read retry [{self._navroute_retries_remaining}]') + logger.debug(f'Navroute read retry [{self._navroute_retries_remaining}]') self._navroute_retries_remaining -= 1 if self._last_navroute_journal_timestamp is None: From 3a78daf66cfc68963c0be8d63581b542bce4b0bb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Mar 2022 09:55:03 +0000 Subject: [PATCH 452/527] Use `daemon` flag for threads, not setDaemon() --- EDMarketConnector.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 6aa27ca3..b3eb10ba 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1672,15 +1672,19 @@ class AppWindow(object): def exit_tray(self, systray: 'SysTrayIcon') -> None: """Tray icon is shutting down.""" - exit_thread = threading.Thread(target=self.onexit) - exit_thread.setDaemon(True) + exit_thread = threading.Thread( + target=self.onexit, + daemon=True, + ) exit_thread.start() def onexit(self, event=None) -> None: """Application shutdown procedure.""" if sys.platform == 'win32': - shutdown_thread = threading.Thread(target=self.systray.shutdown) - shutdown_thread.setDaemon(True) + shutdown_thread = threading.Thread( + target=self.systray.shutdown, + daemon=True, + ) shutdown_thread.start() config.set_shutdown() # Signal we're in shutdown now. From c18c1810de09f0db5340f3a4e52c5f9100926808 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Mar 2022 10:08:53 +0000 Subject: [PATCH 453/527] Pre-Release 5.3.4-beta1: appversion & changelog --- ChangeLog.md | 11 +++++++++++ config/__init__.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index b3c09975..8d7a111c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -29,6 +29,17 @@ produce the Windows executables and installer. * We now test against, and package with, Python 3.10.3. +Release 5.3.4 +=== + +Whilst EDMarketConnector.exe was fixed for the Odyssey Update 11 difference in +Journal file names, EDMC.exe was not. + +* Use the new common function for finding latest journal file in EDMC.py. +* Quietens some NavRoute related logging for the benefit of EDMC.py. This is + now at DEBUG level, rather than INFO. + + Release 5.3.3 === diff --git a/config/__init__.py b/config/__init__.py index 24299124..e9a18438 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.4-beta0' +_static_appversion = '5.3.4-beta1' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From d75edc356ba98cdcec8b1282bafcd0cb412529ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Mar 2022 17:04:14 +0000 Subject: [PATCH 454/527] build(deps-dev): bump pytest from 7.1.0 to 7.1.1 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.1.0...7.1.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 31b82fc3..7b494a84 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -40,7 +40,7 @@ lxml==4.8.0 py2exe==0.11.1.0; sys_platform == 'win32' # Testing -pytest==7.1.0 +pytest==7.1.1 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.3.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. From c2ce38b7695011df9ade8e461d69601f63cb0d04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 17:05:56 +0000 Subject: [PATCH 455/527] build(deps-dev): bump types-requests from 2.27.13 to 2.27.14 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.13 to 2.27.14. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 7b494a84..84cb385a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.941 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.13 +types-requests==2.27.14 # Code formatting tools autopep8==1.6.0 From 693463d3a0dbe58a1f72b83fc09a44a4398af3fd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 22 Mar 2022 07:28:20 +0000 Subject: [PATCH 456/527] Release 5.3.4: appversion (changelog identical to -beta1) --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index e9a18438..fa485ba6 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.4-beta1' +_static_appversion = '5.3.4' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From e9bd0b4124b4008d81c59180ef04a228db491dae Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 22 Mar 2022 07:54:41 +0000 Subject: [PATCH 457/527] develop: post-release version to 5.3.5-beta0 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index fa485ba6..408d50ea 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.4' +_static_appversion = '5.3.5-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 7430a42bdd8466655216ee6dff351a5f6fc8e013 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 23 Mar 2022 08:29:58 +0000 Subject: [PATCH 458/527] EDMC: Use specific sys.exit codes, not a generic one * "Can't read journal" * When we don't know the commander. --- EDMC.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/EDMC.py b/EDMC.py index ed36dfba..1f9afefb 100755 --- a/EDMC.py +++ b/EDMC.py @@ -62,7 +62,8 @@ Locale LC_TIME: {locale.getlocale(locale.LC_TIME)}''' l10n.Translations.install_dummy() SERVER_RETRY = 5 # retry pause for Companion servers [s] -EXIT_SUCCESS, EXIT_SERVER, EXIT_CREDENTIALS, EXIT_VERIFICATION, EXIT_LAGGING, EXIT_SYS_ERR, EXIT_ARGS = range(7) +EXIT_SUCCESS, EXIT_SERVER, EXIT_CREDENTIALS, EXIT_VERIFICATION, EXIT_LAGGING, EXIT_SYS_ERR, EXIT_ARGS, \ + EXIT_JOURNAL_READ_ERR, EXIT_COMMANDER_UNKNOWN = range(9) def versioncmp(versionstring) -> List: @@ -234,11 +235,11 @@ sys.path: {sys.path}''' except Exception: logger.exception("Can't read Journal file") - sys.exit(EXIT_SYS_ERR) + sys.exit(EXIT_JOURNAL_READ_ERR) if not monitor.cmdr: logger.error('Not available while E:D is at the main menu') - sys.exit(EXIT_SYS_ERR) + sys.exit(EXIT_COMMANDER_UNKNOWN) # Get data from Companion API if args.p: From d92c280c49a5858d1571fd632f3f802bd0bceac7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:03:55 +0000 Subject: [PATCH 459/527] build(deps): bump watchdog from 2.1.6 to 2.1.7 Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.6 to 2.1.7. - [Release notes](https://github.com/gorakhargosh/watchdog/releases) - [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst) - [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.1.6...v2.1.7) --- updated-dependencies: - dependency-name: watchdog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 402c5a86..58e992b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ certifi==2021.10.8 requests==2.27.1 -watchdog==2.1.6 +watchdog==2.1.7 # Commented out because this doesn't package well with py2exe infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep From 217860e7423c6ed6e5ef806bb8a2f7c685036e84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:03:59 +0000 Subject: [PATCH 460/527] build(deps-dev): bump mypy from 0.941 to 0.942 Bumps [mypy](https://github.com/python/mypy) from 0.941 to 0.942. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.941...v0.942) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 84cb385a..bfdd80f3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,7 +20,7 @@ flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.941 +mypy==0.942 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.27.14 From 870e15588855636dd62c7e35c410bfa1e8348060 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 17:04:04 +0000 Subject: [PATCH 461/527] build(deps-dev): bump setuptools from 60.10.0 to 61.0.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 60.10.0 to 61.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v60.10.0...v61.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 84cb385a..953061a9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==60.10.0 +setuptools==61.0.0 # Static analysis tools flake8==4.0.1 From bdc6a474551ea3a4bfab1e6f302d8524bef14dbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:05:07 +0000 Subject: [PATCH 462/527] build(deps-dev): bump types-requests from 2.27.14 to 2.27.15 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.14 to 2.27.15. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 55acbc51..bd89aa87 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.942 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.14 +types-requests==2.27.15 # Code formatting tools autopep8==1.6.0 From 7f59ce863695567133ee779b1f5e5ba27c2faae3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:05:11 +0000 Subject: [PATCH 463/527] build(deps-dev): bump setuptools from 61.0.0 to 61.2.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 61.0.0 to 61.2.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v61.0.0...v61.2.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 55acbc51..b0df9fa6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==61.0.0 +setuptools==61.2.0 # Static analysis tools flake8==4.0.1 From 505330022bb21c848129024ab5c6fd54eac9558a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 17:04:56 +0000 Subject: [PATCH 464/527] build(deps-dev): bump grip from 4.6.0 to 4.6.1 Bumps [grip](https://github.com/joeyespo/grip) from 4.6.0 to 4.6.1. - [Release notes](https://github.com/joeyespo/grip/releases) - [Changelog](https://github.com/joeyespo/grip/blob/master/CHANGES.md) - [Commits](https://github.com/joeyespo/grip/compare/v4.6.0...v4.6.1) --- updated-dependencies: - dependency-name: grip dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 09736b73..25c9eaaa 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -29,7 +29,7 @@ types-requests==2.27.15 autopep8==1.6.0 # HTML changelogs -grip==4.6.0 +grip==4.6.1 # Packaging # Used to put together a WiX configuration from template/auto-gen From 04f6728c4ad3797c63cd696e242bcc81b637fa55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 17:05:03 +0000 Subject: [PATCH 465/527] build(deps-dev): bump setuptools from 61.2.0 to 61.3.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 61.2.0 to 61.3.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v61.2.0...v61.3.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 09736b73..8f087de2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==61.2.0 +setuptools==61.3.0 # Static analysis tools flake8==4.0.1 From d03c3d1ec4186124ed038a9a62981185da1d6893 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 17:05:05 +0000 Subject: [PATCH 466/527] build(deps-dev): bump types-requests from 2.27.15 to 2.27.16 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.15 to 2.27.16. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 09736b73..f9669953 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.942 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.15 +types-requests==2.27.16 # Code formatting tools autopep8==1.6.0 From d49a67584e17ff8ddf892a6d387789207c288e0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 17:05:35 +0000 Subject: [PATCH 467/527] build(deps-dev): bump setuptools from 61.3.0 to 62.0.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 61.3.0 to 62.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v61.3.0...v62.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 54f63db7..de165108 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==61.3.0 +setuptools==62.0.0 # Static analysis tools flake8==4.0.1 From 02a84e1f151315b16e6f262b38ed68bbb1985a89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 17:03:10 +0000 Subject: [PATCH 468/527] build(deps): bump actions/upload-artifact from 2 to 3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index dd0dd026..449e1c56 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -41,7 +41,7 @@ jobs: python setup.py py2exe - name: Upload build files - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Built files path: EDMarketConnector_win*.msi From 3bec6124176a1f2a47c43f25bd98c2fc4623753e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 17:03:13 +0000 Subject: [PATCH 469/527] build(deps): bump actions/download-artifact from 2 to 3 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index dd0dd026..5d9fdf32 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Download binary - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: Built files path: ./ From b38ca076b3fccf2c8c053de9a00eb8fdae9f4d4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:05:58 +0000 Subject: [PATCH 470/527] build(deps-dev): bump setuptools from 62.0.0 to 62.1.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 62.0.0 to 62.1.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v62.0.0...v62.1.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index de165108..62fa7579 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==62.0.0 +setuptools==62.1.0 # Static analysis tools flake8==4.0.1 From ba910de4688ce4a6e3773fdffae13e24d9f63b58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 17:06:47 +0000 Subject: [PATCH 471/527] build(deps-dev): bump types-requests from 2.27.16 to 2.27.20 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.16 to 2.27.20. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 62fa7579..6f3850ba 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.942 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.16 +types-requests==2.27.20 # Code formatting tools autopep8==1.6.0 From f99e6759e0c23a61b1776e0a7b2a454f41a005db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:05:39 +0000 Subject: [PATCH 472/527] build(deps-dev): bump pytest from 7.1.1 to 7.1.2 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.1 to 7.1.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.1.1...7.1.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 6f3850ba..250db361 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -40,7 +40,7 @@ lxml==4.8.0 py2exe==0.11.1.0; sys_platform == 'win32' # Testing -pytest==7.1.1 +pytest==7.1.2 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.3.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. From 31e1f5aaa2d652c2d48586c361e09a1eb89b31e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Apr 2022 17:04:07 +0000 Subject: [PATCH 473/527] build(deps-dev): bump types-requests from 2.27.20 to 2.27.22 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.20 to 2.27.22. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 250db361..e6d5f55c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.942 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.20 +types-requests==2.27.22 # Code formatting tools autopep8==1.6.0 From 7862a48c7748dfe308735bbca5ee35258cc4b7b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Apr 2022 17:04:11 +0000 Subject: [PATCH 474/527] build(deps-dev): bump mypy from 0.942 to 0.950 Bumps [mypy](https://github.com/python/mypy) from 0.942 to 0.950. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.942...v0.950) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 250db361..3437f82f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,7 +20,7 @@ flake8-noqa==1.2.1 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.942 +mypy==0.950 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.27.20 From 6ce1d60ee4140871d67148d775bfeaeeb93f5344 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 17:03:20 +0000 Subject: [PATCH 475/527] build(deps-dev): bump types-requests from 2.27.22 to 2.27.24 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.22 to 2.27.24. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index f76467d0..1dc20fad 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.950 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.22 +types-requests==2.27.24 # Code formatting tools autopep8==1.6.0 From 4c97a716f1eba4c4bc57ed15495aa5cfdc334f32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 17:03:30 +0000 Subject: [PATCH 476/527] build(deps-dev): bump types-requests from 2.27.24 to 2.27.25 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.24 to 2.27.25. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1dc20fad..5a080fe1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.950 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.24 +types-requests==2.27.25 # Code formatting tools autopep8==1.6.0 From 1c602cec252bc6c3bccc55ee0b06efcb4449684b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 17:03:36 +0000 Subject: [PATCH 477/527] build(deps-dev): bump pywin32 from 303 to 304 Bumps [pywin32](https://github.com/mhammond/pywin32) from 303 to 304. - [Release notes](https://github.com/mhammond/pywin32/releases) - [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt) - [Commits](https://github.com/mhammond/pywin32/commits) --- updated-dependencies: - dependency-name: pywin32 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1dc20fad..d7cead71 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -44,7 +44,7 @@ pytest==7.1.2 pytest-cov==3.0.0 # Pytest code coverage support coverage[toml]==6.3.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. -pywin32==303; sys_platform == 'win32' +pywin32==304; sys_platform == 'win32' # All of the normal requirements From 723566722594eafde7b53793e2c1a486f72ff5fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 17:04:28 +0000 Subject: [PATCH 478/527] build(deps-dev): bump setuptools from 62.1.0 to 62.2.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 62.1.0 to 62.2.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v62.1.0...v62.2.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a59915ba..f092aee9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==62.1.0 +setuptools==62.2.0 # Static analysis tools flake8==4.0.1 From dfc91b02cd3918ad579a1a0df92b780ec009ed5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 17:06:33 +0000 Subject: [PATCH 479/527] build(deps-dev): bump flake8-comprehensions from 3.8.0 to 3.9.0 Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.8.0 to 3.9.0. - [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases) - [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst) - [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.8.0...3.9.0) --- updated-dependencies: - dependency-name: flake8-comprehensions dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index f092aee9..9e4ae679 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ setuptools==62.2.0 flake8==4.0.1 flake8-annotations-coverage==0.0.6 flake8-cognitive-complexity==0.1.0 -flake8-comprehensions==3.8.0 +flake8-comprehensions==3.9.0 flake8-docstrings==1.6.0 isort==5.10.1 flake8-isort==4.1.1 From 7e2fdf53cbec62b0517d0507d7562c70572982eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 17:06:25 +0000 Subject: [PATCH 480/527] build(deps-dev): bump coverage[toml] from 6.3.2 to 6.3.3 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.3.2 to 6.3.3. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.3.2...6.3.3) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9e4ae679..df321dad 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -42,7 +42,7 @@ py2exe==0.11.1.0; sys_platform == 'win32' # Testing pytest==7.1.2 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.3.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.3.3 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==304; sys_platform == 'win32' From f6a7853142f983a76d633603512529b838b16dc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 17:06:29 +0000 Subject: [PATCH 481/527] build(deps-dev): bump flake8-noqa from 1.2.1 to 1.2.2 Bumps [flake8-noqa](https://github.com/plinss/flake8-noqa) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/plinss/flake8-noqa/releases) - [Commits](https://github.com/plinss/flake8-noqa/compare/v1.2.1...v1.2.2) --- updated-dependencies: - dependency-name: flake8-noqa dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9e4ae679..cae2b070 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,7 +16,7 @@ flake8-docstrings==1.6.0 isort==5.10.1 flake8-isort==4.1.1 flake8-json==21.7.0 -flake8-noqa==1.2.1 +flake8-noqa==1.2.2 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 From d38262efd3b2cc3d79059c6101b41e17437cba95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 17:06:39 +0000 Subject: [PATCH 482/527] build(deps): bump watchdog from 2.1.7 to 2.1.8 Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.7 to 2.1.8. - [Release notes](https://github.com/gorakhargosh/watchdog/releases) - [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst) - [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.1.7...v2.1.8) --- updated-dependencies: - dependency-name: watchdog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 58e992b3..48524e61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ certifi==2021.10.8 requests==2.27.1 -watchdog==2.1.7 +watchdog==2.1.8 # Commented out because this doesn't package well with py2exe infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep From 1fecdfa9b9ddf1e9619d6e03c88bc398b4b940d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 17:04:46 +0000 Subject: [PATCH 483/527] build(deps-dev): bump types-requests from 2.27.25 to 2.27.26 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.25 to 2.27.26. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 7e495e3e..d65cf133 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.950 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.25 +types-requests==2.27.26 # Code formatting tools autopep8==1.6.0 From beb8007ec6b4f04ab0eb6876dcbbc172a49e1f27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 17:04:52 +0000 Subject: [PATCH 484/527] build(deps-dev): bump setuptools from 62.2.0 to 62.3.1 Bumps [setuptools](https://github.com/pypa/setuptools) from 62.2.0 to 62.3.1. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v62.2.0...v62.3.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 7e495e3e..dfe13624 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==62.2.0 +setuptools==62.3.1 # Static analysis tools flake8==4.0.1 From 00e74c59c34f018df839a53add7cc262e956ef6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 17:03:38 +0000 Subject: [PATCH 485/527] build(deps): bump certifi from 2021.10.8 to 2022.5.18 Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.10.8 to 2022.5.18. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/commits) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 48524e61..8564d359 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -certifi==2021.10.8 +certifi==2022.5.18 requests==2.27.1 watchdog==2.1.8 # Commented out because this doesn't package well with py2exe From 965e9c5fbde2c78e487d1bc000e3d364fb6b45c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 17:03:44 +0000 Subject: [PATCH 486/527] build(deps-dev): bump setuptools from 62.3.1 to 62.3.2 Bumps [setuptools](https://github.com/pypa/setuptools) from 62.3.1 to 62.3.2. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v62.3.1...v62.3.2) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 2ed23247..161087cc 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==62.3.1 +setuptools==62.3.2 # Static analysis tools flake8==4.0.1 From 5899b02f2b953dc873a4b1ee35a6b0227965f358 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 17:03:46 +0000 Subject: [PATCH 487/527] build(deps-dev): bump types-requests from 2.27.26 to 2.27.27 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.26 to 2.27.27. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 2ed23247..be401b41 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.950 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.26 +types-requests==2.27.27 # Code formatting tools autopep8==1.6.0 From f390a820ea098bf27061a2c1e24bf5fd64fcbcf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 17:03:52 +0000 Subject: [PATCH 488/527] build(deps-dev): bump flake8-comprehensions from 3.9.0 to 3.10.0 Bumps [flake8-comprehensions](https://github.com/adamchainz/flake8-comprehensions) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/adamchainz/flake8-comprehensions/releases) - [Changelog](https://github.com/adamchainz/flake8-comprehensions/blob/main/HISTORY.rst) - [Commits](https://github.com/adamchainz/flake8-comprehensions/compare/3.9.0...3.10.0) --- updated-dependencies: - dependency-name: flake8-comprehensions dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 2ed23247..857506d6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ setuptools==62.3.1 flake8==4.0.1 flake8-annotations-coverage==0.0.6 flake8-cognitive-complexity==0.1.0 -flake8-comprehensions==3.9.0 +flake8-comprehensions==3.10.0 flake8-docstrings==1.6.0 isort==5.10.1 flake8-isort==4.1.1 From 6fec653ebc352da438c3184ae730584964602e56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 17:04:18 +0000 Subject: [PATCH 489/527] build(deps): bump certifi from 2022.5.18 to 2022.5.18.1 Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.5.18 to 2022.5.18.1. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/compare/2022.05.18...2022.05.18.1) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8564d359..899941f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -certifi==2022.5.18 +certifi==2022.5.18.1 requests==2.27.1 watchdog==2.1.8 # Commented out because this doesn't package well with py2exe From 038ffa4f669b0b50b6cba7b8266c6eaa06ae86a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 17:04:05 +0000 Subject: [PATCH 490/527] build(deps-dev): bump coverage[toml] from 6.3.3 to 6.4 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.3.3 to 6.4. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.3.3...6.4) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 487e9218..bd7fb77d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -42,7 +42,7 @@ py2exe==0.11.1.0; sys_platform == 'win32' # Testing pytest==7.1.2 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.3.3 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.4 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==304; sys_platform == 'win32' From 8c03c7ab1f901fd1fe15aac1d78a6697b5916260 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 17:07:36 +0000 Subject: [PATCH 491/527] build(deps-dev): bump mypy from 0.950 to 0.960 Bumps [mypy](https://github.com/python/mypy) from 0.950 to 0.960. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.950...v0.960) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index bd7fb77d..ae9c23a5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,7 +20,7 @@ flake8-noqa==1.2.2 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.950 +mypy==0.960 pep8-naming==0.12.1 safety==1.10.3 types-requests==2.27.27 From 5fef8c048c39d466fec27fc7d4ddf4744a7c4861 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 17:03:58 +0000 Subject: [PATCH 492/527] build(deps-dev): bump types-requests from 2.27.27 to 2.27.29 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.27 to 2.27.29. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index bd7fb77d..962bf502 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.950 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.27 +types-requests==2.27.29 # Code formatting tools autopep8==1.6.0 From db14c747b43f80258ce7ebcdb73fdac7e161db24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 17:04:05 +0000 Subject: [PATCH 493/527] build(deps): bump semantic-version from 2.9.0 to 2.10.0 Bumps [semantic-version](https://github.com/rbarrois/python-semanticversion) from 2.9.0 to 2.10.0. - [Release notes](https://github.com/rbarrois/python-semanticversion/releases) - [Changelog](https://github.com/rbarrois/python-semanticversion/blob/master/ChangeLog) - [Commits](https://github.com/rbarrois/python-semanticversion/compare/2.9.0...2.10.0) --- updated-dependencies: - dependency-name: semantic-version dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 899941f3..fe63dbfe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ watchdog==2.1.8 infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep # pyyaml==5.3.1 watchdog dep -semantic-version==2.9.0 +semantic-version==2.10.0 # Base requirement for MacOS pyobjc; sys_platform == 'darwin' From 88b3dc27e583ce3eb79e3f48d831e1cada41980d Mon Sep 17 00:00:00 2001 From: Gareth Harper Date: Wed, 25 May 2022 14:01:54 +0000 Subject: [PATCH 494/527] Added fssbodysignals --- plugins/eddn.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index c7cd4059..0bca62a9 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1213,6 +1213,57 @@ class EDDN: this.eddn.export_journal_entry(cmdr, entry, msg) return None + def export_journal_fssbodysignals( + self, cmdr: str, system_name: str, system_starpos: list, is_beta: bool, entry: MutableMapping[str, Any] + ) -> Optional[str]: + """ + Send an FSSBodySignals message to EDDN on the correct schema. + + :param cmdr: the commander under which this upload is made + :param system_name: Name of current star system + :param system_starpos: Coordinates of current star system + :param is_beta: whether or not we are in beta mode + :param entry: the journal entry to send + """ + # { + # "timestamp" : "2022-03-15T13:07:51Z", + # "event" : "FSSBodySignals", + # "BodyName" : "Phroi Blou BQ-Y d1162 1 a", + # "BodyID" : 12, + # "SystemAddress" : 39935704602251, + # "Signals" : [ + # { + # "Type" : "$SAA_SignalType_Geological;", + # "Type_Localised" : "Geological", + # "Count" : 3 + # } + # ] + # } + + ####################################################################### + # Elisions + entry = filter_localised(entry) + ####################################################################### + + ####################################################################### + # Augmentations + ####################################################################### + # In this case should add StarPos + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) + if isinstance(ret, str): + return ret + + entry = ret + ####################################################################### + + msg = { + '$schemaRef': f'https://eddn.edcd.io/schemas/fssbodysignals/1{"/test" if is_beta else ""}', + 'message': entry + } + + this.eddn.export_journal_entry(cmdr, entry, msg) + return None + def canonicalise(self, item: str) -> str: """ Canonicalise the given commodity name. @@ -1545,7 +1596,7 @@ def journal_entry( # noqa: C901, CCR001 # NB: If adding FSSSignalDiscovered these absolutely come in at login # time **BEFORE** the `Location` event, so we won't yet know things - # like SystemNane, or StarPos. + # like SystemName, or StarPos. # We can either have the "now send the batch" code add such (but # that has corner cases around changing systems in the meantime), # drop those events, or if the schema allows, send without those @@ -1559,6 +1610,14 @@ def journal_entry( # noqa: C901, CCR001 is_beta, entry ) + elif event_name == 'fssbodysignals': + return this.eddn.export_journal_fssbodysignals( + cmdr, + system, + state['StarPos'], + is_beta, + entry + ) # Send journal schema events to EDDN, but not when on a crew if (config.get_int('output') & config.OUT_SYS_EDDN and not state['Captain'] and From 8bb7f9d9baf3d2b00b9e8a0286ef32eaa1ddabdd Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 12:28:58 +0100 Subject: [PATCH 495/527] EDDN/fssbodysignals: Add location paranoia check --- plugins/eddn.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 0bca62a9..df6fdab2 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1248,7 +1248,12 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - # In this case should add StarPos + # In this case should add SystemName and StarPos, but only if the + # SystemAddress of where we think we are matches. + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("SystemAddress isn't current location! Can't add augmentations!") + return 'Wrong System! Missed jump ?' + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret @@ -1610,6 +1615,7 @@ def journal_entry( # noqa: C901, CCR001 is_beta, entry ) + elif event_name == 'fssbodysignals': return this.eddn.export_journal_fssbodysignals( cmdr, From 6b54f721b0263c0da0f74e1dd85b1d6904a530c7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 14:49:43 +0100 Subject: [PATCH 496/527] eddn: approachsettlement: Location cross-check paranoia --- plugins/eddn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index df6fdab2..24ed24b9 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1159,7 +1159,12 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - # In this case should add StarSystem and StarPos + # In this case should add SystemName and StarPos, but only if the + # SystemAddress of where we think we are matches. + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("SystemAddress isn't current location! Can't add augmentations!") + return 'Wrong System! Missed jump ?' + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret From 834debde988e5f0612da3880b0deb979dbc8ef5e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 14:56:33 +0100 Subject: [PATCH 497/527] eddn: codexentry: Location cross-check paranoia --- plugins/eddn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 24ed24b9..d39c6c60 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -946,7 +946,12 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - # General 'system' augmentations + # In this case should add StarPos, but only if the + # SystemAddress of where we think we are matches. + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("SystemAddress isn't current location! Can't add augmentations!") + return 'Wrong System! Missed jump ?' + ret = this.eddn.entry_augment_system_data(entry, entry['System'], system_starpos) if isinstance(ret, str): return ret From 4baa2490af890e024c9c1c5eac301ba2550b838a Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 15:00:19 +0100 Subject: [PATCH 498/527] eddn: fssallbodiesfound: Location cross-check paranoia --- plugins/eddn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index d39c6c60..464045b3 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1207,7 +1207,12 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### - # In this case should add StarSystem and StarPos + # In this case should add StarPos, but only if the + # SystemAddress of where we think we are matches. + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("SystemAddress isn't current location! Can't add augmentations!") + return 'Wrong System! Missed jump ?' + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret From 3702b465e563c75db14ec7a1f60a9173bb5a6b40 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 15:03:02 +0100 Subject: [PATCH 499/527] eddn: fssdiscoveryscan: Location cross-check paranoia --- plugins/eddn.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 464045b3..abb128ce 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -854,6 +854,12 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### + # In this case should add StarPos, but only if the + # SystemAddress of where we think we are matches. + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("SystemAddress isn't current location! Can't add augmentations!") + return 'Wrong System! Missed jump ?' + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret From e38ea28ba6371ff07db4ec4ca6fa69ad389fbb32 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 15:05:11 +0100 Subject: [PATCH 500/527] eddn: navbeaconscan: Location cross-check paranoia --- plugins/eddn.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index abb128ce..ff88b1da 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -896,6 +896,12 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### + # In this case should add StarSystem and StarPos, but only if the + # SystemAddress of where we think we are matches. + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("SystemAddress isn't current location! Can't add augmentations!") + return 'Wrong System! Missed jump ?' + ret = this.eddn.entry_augment_system_data(entry, system_name, system_starpos) if isinstance(ret, str): return ret From 2e6d6b8c02e9574390f7c4c9fc984fa90ceddd34 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 15:07:25 +0100 Subject: [PATCH 501/527] eddn: scanbarycentre: Location cross-check paranoia --- plugins/eddn.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index ff88b1da..8d40262e 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1045,6 +1045,12 @@ class EDDN: ####################################################################### # Augmentations ####################################################################### + # In this case should add StarPos, but only if the + # SystemAddress of where we think we are matches. + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("SystemAddress isn't current location! Can't add augmentations!") + return 'Wrong System! Missed jump ?' + ret = this.eddn.entry_augment_system_data(entry, entry['StarSystem'], system_starpos) if isinstance(ret, str): return ret From 4a207429cdaad416ba17f503ec0833a930bfd9aa Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 15:20:45 +0100 Subject: [PATCH 502/527] eddn: journal schema: Add notes about present/missing fields --- plugins/eddn.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 8d40262e..5335d0ac 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1694,6 +1694,16 @@ def journal_entry( # noqa: C901, CCR001 entry['Body'] = this.body_name entry['BodyType'] = 'Planet' + # The generic journal schema is for events: + # Docked, FSDJump, Scan, Location, SAASignalsFound, CarrierJump + # (Also CodexEntry, but that has its own schema and handling). + # StarSystem SystemAddress StarPos + # Docked Y Y N + # FSDJump Y Y Y + # Scan Y Y N + # Location Y Y Y + # SAASignalsFound N Y N + # CarrierJump Y Y Y # add mandatory StarSystem, StarPos and SystemAddress properties to Scan events if 'StarSystem' not in entry: if not system: From 4fcd2ae3f3beb2eb3c9ca53c0ebb89ffe302683c Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 15:30:20 +0100 Subject: [PATCH 503/527] eddn: journal: Make `SystemAddress` a check, not an augmentation On checking, all of the events valid for the journal schema (and CodexEntry has its own schema and separate EDMC code) already contain SystemAddress, so it would never be added as an augmentation. Instead, turn this into a sanity check. --- plugins/eddn.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 5335d0ac..2e219541 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1697,6 +1697,7 @@ def journal_entry( # noqa: C901, CCR001 # The generic journal schema is for events: # Docked, FSDJump, Scan, Location, SAASignalsFound, CarrierJump # (Also CodexEntry, but that has its own schema and handling). + # Journals 2021-08-23 to 2022-05-29 # StarSystem SystemAddress StarPos # Docked Y Y N # FSDJump Y Y Y @@ -1704,7 +1705,12 @@ def journal_entry( # noqa: C901, CCR001 # Location Y Y Y # SAASignalsFound N Y N # CarrierJump Y Y Y - # add mandatory StarSystem, StarPos and SystemAddress properties to Scan events + + if 'SystemAddress' not in entry: + logger.warning("journal schema event doesn't contain SystemAddress when it should, aborting") + return "No SystemAddress in event, aborting send" + + # add mandatory StarSystem and StarPos properties to events if 'StarSystem' not in entry: if not system: logger.warning("system is falsey, can't add StarSystem") @@ -1725,13 +1731,6 @@ def journal_entry( # noqa: C901, CCR001 entry['StarPos'] = list(this.coordinates) - if 'SystemAddress' not in entry: - if not this.systemaddress: - logger.warning("this.systemaddress is falsey, can't add SystemAddress") - return "this.systemaddress is falsey, can't add SystemAddress" - - entry['SystemAddress'] = this.systemaddress - try: this.eddn.export_journal_generic(cmdr, is_beta, filter_localised(entry)) From 9fd3c3852a39f64efe9928b47be95d784a62e459 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 29 May 2022 15:36:42 +0100 Subject: [PATCH 504/527] eddn: journal: Add SystemAddress cross-check to StarSystem augmentation --- plugins/eddn.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/eddn.py b/plugins/eddn.py index 2e219541..bc043926 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1712,6 +1712,10 @@ def journal_entry( # noqa: C901, CCR001 # add mandatory StarSystem and StarPos properties to events if 'StarSystem' not in entry: + if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: + logger.warning("event has no StarSystem, but SystemAddress isn't current location") + return "Wrong System! Delayed Scan event?" + if not system: logger.warning("system is falsey, can't add StarSystem") return "system is falsey, can't add StarSystem" From 020aa325a737ad503201cf75101caa0b09c72d29 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 1 Jun 2022 16:17:34 +0100 Subject: [PATCH 505/527] eddn: Cite event name in some logging Not needed where we're in an event-specific function, but is in generic event handling. --- plugins/eddn.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index bc043926..8db26469 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1707,30 +1707,31 @@ def journal_entry( # noqa: C901, CCR001 # CarrierJump Y Y Y if 'SystemAddress' not in entry: - logger.warning("journal schema event doesn't contain SystemAddress when it should, aborting") + logger.warning(f"journal schema event({entry['event']}) doesn't contain SystemAddress when it should, " + "aborting") return "No SystemAddress in event, aborting send" # add mandatory StarSystem and StarPos properties to events if 'StarSystem' not in entry: if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: - logger.warning("event has no StarSystem, but SystemAddress isn't current location") + logger.warning(f"event({entry['event']}) has no StarSystem, but SystemAddress isn't current location") return "Wrong System! Delayed Scan event?" if not system: - logger.warning("system is falsey, can't add StarSystem") + logger.warning(f"system is falsey, can't add StarSystem to {entry['event']} event") return "system is falsey, can't add StarSystem" entry['StarSystem'] = system if 'StarPos' not in entry: if not this.coordinates: - logger.warning("this.coordinates is falsey, can't add StarPos") + logger.warning(f"this.coordinates is falsey, can't add StarPos to {entry['event']} event") return "this.coordinates is falsey, can't add StarPos" # Gazelle[TD] reported seeing a lagged Scan event with incorrect # augmented StarPos: if this.systemaddress is None or this.systemaddress != entry['SystemAddress']: - logger.warning("event has no StarPos, but SystemAddress isn't current location") + logger.warning(f"event({entry['event']}) has no StarPos, but SystemAddress isn't current location") return "Wrong System! Delayed Scan event?" entry['StarPos'] = list(this.coordinates) From 1349b2bca159d1dc959c14b3d9832076d6680b40 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 1 Jun 2022 16:24:51 +0100 Subject: [PATCH 506/527] eddn: codexentry: Ody Update 12 will add BodyID * So add a check to see if the event already has it, and leave it if so. * And might as well have a check on BodyName in case that gets added as well. --- plugins/eddn.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 8db26469..c934f6d7 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -976,15 +976,20 @@ class EDDN: f' "{this.status_body_name}" ({type(this.status_body_name)})') else: - entry['BodyName'] = this.status_body_name - # Only set BodyID if journal BodyName matches the Status.json one. - # This avoids binary body issues. - if this.status_body_name == this.body_name: - if this.body_id is not None and isinstance(this.body_id, int): - entry['BodyID'] = this.body_id + # In case Frontier add it in + if entry.get('BodyName', None) is None: + entry['BodyName'] = this.status_body_name - else: - logger.warning(f'this.body_id was not set properly: "{this.body_id}" ({type(this.body_id)})') + # Frontier are adding this in Odyssey Update 12 + if entry.get('BodyID', None) is None: + # Only set BodyID if journal BodyName matches the Status.json one. + # This avoids binary body issues. + if this.status_body_name == this.body_name: + if this.body_id is not None and isinstance(this.body_id, int): + entry['BodyID'] = this.body_id + + else: + logger.warning(f'this.body_id was not set properly: "{this.body_id}" ({type(this.body_id)})') ####################################################################### # Check just the top-level strings with minLength=1 in the schema From d63a7e81d239dd97c93693c77c30bb7a8c09c875 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jun 2022 17:07:33 +0000 Subject: [PATCH 507/527] build(deps-dev): bump lxml from 4.8.0 to 4.9.0 Bumps [lxml](https://github.com/lxml/lxml) from 4.8.0 to 4.9.0. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](https://github.com/lxml/lxml/compare/lxml-4.8.0...lxml-4.9.0) --- updated-dependencies: - dependency-name: lxml dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8f1a14b7..c053c88f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -33,7 +33,7 @@ grip==4.6.1 # Packaging # Used to put together a WiX configuration from template/auto-gen -lxml==4.8.0 +lxml==4.9.0 # We only need py2exe on windows. # Pre-release version addressing semantic_version 2.9.0+ issues: # From c12a200bee62a896e081fe61d0d71d31a7d852a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 17:04:24 +0000 Subject: [PATCH 508/527] build(deps-dev): bump types-requests from 2.27.29 to 2.27.30 Bumps [types-requests](https://github.com/python/typeshed) from 2.27.29 to 2.27.30. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8f1a14b7..5b5a2800 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.960 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.29 +types-requests==2.27.30 # Code formatting tools autopep8==1.6.0 From dfed4522d697d5018185104f60b8741a303ac107 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 17:04:33 +0000 Subject: [PATCH 509/527] build(deps-dev): bump coverage[toml] from 6.4 to 6.4.1 Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 6.4 to 6.4.1. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.4...6.4.1) --- updated-dependencies: - dependency-name: coverage[toml] dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8f1a14b7..4fa55496 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -42,7 +42,7 @@ py2exe==0.11.1.0; sys_platform == 'win32' # Testing pytest==7.1.2 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.4 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.4.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==304; sys_platform == 'win32' From e402d442a06c0be73ba29ed3822667107136934c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 17:04:36 +0000 Subject: [PATCH 510/527] build(deps-dev): bump pep8-naming from 0.12.1 to 0.13.0 Bumps [pep8-naming](https://github.com/PyCQA/pep8-naming) from 0.12.1 to 0.13.0. - [Release notes](https://github.com/PyCQA/pep8-naming/releases) - [Changelog](https://github.com/PyCQA/pep8-naming/blob/main/CHANGELOG.rst) - [Commits](https://github.com/PyCQA/pep8-naming/compare/0.12.1...0.13.0) --- updated-dependencies: - dependency-name: pep8-naming dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8f1a14b7..6db24ef1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -21,7 +21,7 @@ flake8-polyfill==1.0.2 flake8-use-fstring==1.3 mypy==0.960 -pep8-naming==0.12.1 +pep8-naming==0.13.0 safety==1.10.3 types-requests==2.27.29 From 62c8af4dc049a7fc0e87f090f27b54eac0ee0217 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 4 Jun 2022 14:55:27 +0100 Subject: [PATCH 511/527] eddn: Use `if '' not in :` idiom. --- plugins/eddn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index c934f6d7..05835a12 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -977,11 +977,11 @@ class EDDN: else: # In case Frontier add it in - if entry.get('BodyName', None) is None: + if 'BodyName' not in entry: entry['BodyName'] = this.status_body_name # Frontier are adding this in Odyssey Update 12 - if entry.get('BodyID', None) is None: + if 'BodyID' not in entry: # Only set BodyID if journal BodyName matches the Status.json one. # This avoids binary body issues. if this.status_body_name == this.body_name: From e38d5e1b467699276eb344db7e5f40a70e711a57 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 4 Jun 2022 16:57:18 +0100 Subject: [PATCH 512/527] CAPI: Check if lastStarport->id matches Journal MarketID Ref: --- EDMarketConnector.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index b3eb10ba..283c3bf5 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1100,6 +1100,11 @@ class AppWindow(object): self.capi_query_holdoff_time = capi_response.query_time + companion.capi_query_cooldown + elif capi_response.capi_data['lastStarport']['id'] != monitor.station_marketid: + logger.warning(f"MarketID mis-match: {capi_response.capi_data['lastStarport']['id']!r} !=" + f" {monitor.station_marketid!r}") + raise companion.ServerLagging() + elif not monitor.state['OnFoot'] and capi_response.capi_data['ship']['id'] != monitor.state['ShipID']: # CAPI ship must match logger.warning(f"not {monitor.state['OnFoot']!r} and " From 8e8f09ade318475035d64c8c31623806e2605778 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 4 Jun 2022 17:27:08 +0100 Subject: [PATCH 513/527] Journal: FCMaterials: Implement parsing separate file This re-uses much of the NavRoute.json code, with a minor tweak to *not* store the result in monitor.state, instead just returning it to caller. --- monitor.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/monitor.py b/monitor.py index dd388875..eb9fbfb3 100644 --- a/monitor.py +++ b/monitor.py @@ -31,6 +31,7 @@ from EDMCLogging import get_main_logger logger = get_main_logger() STARTUP = 'journal.startup' MAX_NAVROUTE_DISCREPANCY = 5 # Timestamp difference in seconds +MAX_FCMATERIALS_DISCREPANCY = 5 # Timestamp difference in seconds if TYPE_CHECKING: def _(x: str) -> str: @@ -127,6 +128,9 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self._navroute_retries_remaining = 0 self._last_navroute_journal_timestamp: Optional[float] = None + self._fcmaterials_retries_remaining = 0 + self._last_fcmaterials_journal_timestamp: Optional[float] = None + self.__init_state() def __init_state(self) -> None: @@ -1360,6 +1364,16 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below if self.__navroute_retry(): entry = self.state['NavRoute'] + elif event_type == 'fcmaterials' and not self.catching_up: + # assume we've failed out the gate, then pull it back if things are fine + self._last_fcmaterials_journal_timestamp = mktime(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) + self._fcmaterials_retries_remaining = 11 + + # Added in ED 4.0.0.1300 - Fleet Carrier Materials market in FCMaterials.json + # rather than duplicating this, lets just call the function + if fcmaterials := self.__fcmaterials_retry(): + entry = fcmaterials + elif event_type == 'moduleinfo': with open(join(self.currentdir, 'ModulesInfo.json'), 'rb') as mf: # type: ignore try: @@ -2227,6 +2241,32 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below return data + def _parse_fcmaterials_file(self) -> Optional[dict[str, Any]]: + """Read and parse FCMaterials.json.""" + if self.currentdir is None: + raise ValueError('currentdir unset') + + try: + + with open(join(self.currentdir, 'FCMaterials.json'), 'r') as f: + raw = f.read() + + except Exception as e: + logger.exception(f'Could not open FCMaterials file. Bailing: {e}') + return None + + try: + data = json.loads(raw) + + except json.JSONDecodeError: + logger.exception('Failed to decode FCMaterials.json', exc_info=True) + return None + + if 'timestamp' not in data: # quick sanity check + return None + + return data + @staticmethod def _parse_journal_timestamp(source: str) -> float: return mktime(strptime(source, '%Y-%m-%dT%H:%M:%SZ')) @@ -2267,6 +2307,41 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self._last_navroute_journal_timestamp = None return True + def __fcmaterials_retry(self) -> Optional[Dict[str, Any]]: + """Retry reading FCMaterials files.""" + if self._fcmaterials_retries_remaining == 0: + return None + + logger.debug(f'FCMaterials read retry [{self._fcmaterials_retries_remaining}]') + self._fcmaterials_retries_remaining -= 1 + + if self._last_fcmaterials_journal_timestamp is None: + logger.critical('Asked to retry for FCMaterials but also no set time to compare? This is a bug.') + return None + + if (file := self._parse_fcmaterials_file()) is None: + logger.debug( + 'Failed to parse FCMaterials.json. ' + + ('Trying again' if self._fcmaterials_retries_remaining > 0 else 'Giving up') + ) + return None + + # _parse_fcmaterials_file verifies that this exists for us + file_time = self._parse_journal_timestamp(file['timestamp']) + if abs(file_time - self._last_fcmaterials_journal_timestamp) > MAX_FCMATERIALS_DISCREPANCY: + logger.debug( + f'Time discrepancy of more than {MAX_FCMATERIALS_DISCREPANCY}s --' + f' ({abs(file_time - self._last_fcmaterials_journal_timestamp)}).' + f' {"Trying again" if self._fcmaterials_retries_remaining > 0 else "Giving up"}.' + ) + return None + + # everything is good, lets set what we need to and make sure we dont try again + logger.info('Successfully read FCMaterials file for last FCMaterials event.') + self._fcmaterials_retries_remaining = 0 + self._last_fcmaterials_journal_timestamp = None + return file + # singleton monitor = EDLogs() From 52cc71a217e7e3372a82fbb0f9a6ecd8568a72c6 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 5 Jun 2022 15:31:28 +0100 Subject: [PATCH 514/527] eddn: Clear bodyname/id on supercruiseexit, if at orbital station --- plugins/eddn.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/eddn.py b/plugins/eddn.py index 05835a12..ff4729a1 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -1558,7 +1558,19 @@ def journal_entry( # noqa: C901, CCR001 this.odyssey = entry['odyssey'] = state['Odyssey'] # Track location - if event_name in ('location', 'fsdjump', 'docked', 'carrierjump'): + if event_name == 'supercruiseexit': + # For any orbital station we have no way of determining the body + # it orbits: + # + # In-ship Status.json doesn't specify this. + # On-foot Status.json lists the station itself as Body. + # Location for stations (on-foot or in-ship) has station as Body. + # SupercruiseExit (own ship or taxi) lists the station as the Body. + if entry['BodyType'] == 'Station': + this.body_name = None + this.body_id = None + + elif event_name in ('location', 'fsdjump', 'docked', 'carrierjump'): if event_name in ('location', 'carrierjump'): if entry.get('BodyType') == 'Planet': this.body_name = entry.get('Body') From c1ed1f57e6ef5e8dae4b7f67194ba88eaf706b70 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 6 Jun 2022 13:35:28 +0100 Subject: [PATCH 515/527] python: Bump to version 3.10.4 --- .github/workflows/windows-build.yml | 2 +- .python-version | 2 +- ChangeLog.md | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index b70e1bf1..c38591cd 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v3 with: - python-version: "3.10.3" + python-version: "3.10.4" architecture: "x86" - name: Install python tools diff --git a/.python-version b/.python-version index 7d4ef04f..8d7f852b 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.3 +3.10.4 diff --git a/ChangeLog.md b/ChangeLog.md index 8d7a111c..52110683 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.10.3. +* We now test against, and package with, Python 3.10.4. **As a consequence of this we no longer support Windows 7. This is due to @@ -27,7 +27,10 @@ produce the Windows executables and installer. --- -* We now test against, and package with, Python 3.10.3. +Pre-Release 5.4.0-beta0 +=== + +* We now test against, and package with, Python 3.10.4. Release 5.3.4 === From 0a31a537310a65f2de2a4ffe55f9254d338386ef Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 6 Jun 2022 13:48:00 +0100 Subject: [PATCH 516/527] Pre-Release 5.4.0-beta0: appversion & changelog --- ChangeLog.md | 26 ++++++++++++++++++++++++++ config/__init__.py | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 52110683..1d480798 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -31,6 +31,32 @@ Pre-Release 5.4.0-beta0 === * We now test against, and package with, Python 3.10.4. +* New EDDN schema `fssbodysignals` is now supported. +* Odyssey Update 12 will add `BodyID` to `CodexEntry` journal events, so don't + overwrite this with an augmentation if it is already present. We've also + added the same for `BodyName` in case Frontier ever add that. +Bug Fixes +--- +* Cross-check the `MarketID` in CAPI data, not only the station name, to ensure + the data is for the correct station. Closes [#1572](https://github.com/EDCD/EDMarketConnector/issues/1572). +* Location cross-check paranoia added to several EDDN message types to ensure + no bad data is sent. +* Ensure we don't send bad BodyID/Name for an orbital station if the player + uses a taxi. + Closes [#1522](https://github.com/EDCD/EDMarketConnector/issues/1522). + +Developers +--- +* Odyssey Update 12 adds a new Journal event, and file, `FCMaterials.json`, + detailing the available trades at a Fleet Carrier's bar tender. Support has + been added for this. Plugin developers are sent an `FCMaterials` event + with the full contents of the file. + +EDMC.exe +--- +This now uses specific exit codes in all cases, rather than a generic +`EXIT_SYS_ERR` (6) for some cases. See the appropriate line in EDMC.py for +details. Release 5.3.4 === diff --git a/config/__init__.py b/config/__init__.py index 408d50ea..becde1af 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.5-beta0' +_static_appversion = '5.4.0-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From c8fb9b1c4b170527e6618ef4dbdd1d15ffe88ff1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 6 Jun 2022 13:49:19 +0100 Subject: [PATCH 517/527] develop: Bump appversion in anticipation of 5.4.0 release --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 408d50ea..924151ef 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.5-beta0' +_static_appversion = '5.4.1-alpha0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 77145831fe62a994663033388b3363fd0a36eee7 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 6 Jun 2022 13:51:58 +0100 Subject: [PATCH 518/527] L10n: Updated translations from onesky --- L10n/cs.strings | 474 ++++++++++++++++---------------- L10n/de.strings | 552 ++++++++++++++++++++----------------- L10n/es.strings | 496 ++++++++++++++++----------------- L10n/fi.strings | 420 ++++++++++++++-------------- L10n/fr.strings | 350 +++++++++++------------ L10n/hu.strings | 346 +++++++++++------------ L10n/it.strings | 430 ++++++++++++++--------------- L10n/ja.strings | 579 +++++++++++++++++++++----------------- L10n/ko.strings | 504 +++++++++++++++++----------------- L10n/lv.strings | 318 ++++++++++----------- L10n/nl.strings | 350 +++++++++++------------ L10n/pl.strings | 579 +++++++++++++++++++++----------------- L10n/pt-BR.strings | 579 +++++++++++++++++++++----------------- L10n/pt-PT.strings | 579 +++++++++++++++++++++----------------- L10n/ru.strings | 579 +++++++++++++++++++++----------------- L10n/sl.strings | 300 ++++++++++---------- L10n/sr-Latn-BA.strings | 579 +++++++++++++++++++++----------------- L10n/sr-Latn.strings | 579 +++++++++++++++++++++----------------- L10n/sv-SE.strings | 350 +++++++++++------------ L10n/uk.strings | 388 +++++++++++++------------- L10n/zh-Hans.strings | 595 +++++++++++++++++++++++----------------- 21 files changed, 5281 insertions(+), 4645 deletions(-) diff --git a/L10n/cs.strings b/L10n/cs.strings index f7f6988f..cbb40363 100644 --- a/L10n/cs.strings +++ b/L10n/cs.strings @@ -1,32 +1,110 @@ /* Language name */ "!Language" = "Čeština"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Chyba: Frontier CAPI neodpovídá"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Odesílání dat do EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Chyba: Server Frontieru laguje"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Chyba: Nelze se připojit k EDDN"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Chyba: Chybné přihlašovací údaje"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Odeslat data o stanici do Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Chyba: Nesprávný CMDR"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Odeslat sken a data o systému do Elite Dangerous Data Network"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Chyba"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Pozdržet odeslání po zadokování"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Chyba: Nejde ověřit token customer_id"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Odesílat letový log a status CMDRa do EDSM"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Chyba: customer_id nesouhlasí!"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Přihlašovací údaje Elite Dangerous Star Map"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Chyba: nepovedlo se získat token"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Dotaz na Frontier CAPI selhal"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Jméno CMDRa"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API klíč"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Žádná"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Chyba: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Chyba: Nelze se připojit k EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Odesílat letový log a status CMDRa na Inaru"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Přihlašovací údaje k Inaře"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Chyba: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normal"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Nastavte si URL pro konfiguraci lodi na coriolis.io. Adresa MUSÍ končit '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "Normal URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Reset"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "Beta URL"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Neplatný režim přepisu Coriolis!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Zpracování EDDB deníku je deaktivováno. Zkontrolujte log."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "Obsluha EDDN deníku je deaktivována. Zkontrolujte log."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "Obsluha EDSM deaktivována. Zkontrolujte log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara deaktivována. Zkontrolujte log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Nebyla vrácena žádná data komandéra"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Přepsat volbu Beta/Normal"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Adresář deníku je již uzamčen"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Nové umístění adresáře deníku je již uzamčeno. {CR} Můžete zkusit tento problém vyřešit a Opakovat, nebo Ignorovat."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Opakovat"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignorovat"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopírovat"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Aktualizovat"; @@ -37,25 +115,22 @@ /* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Neznámý"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Loď"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Oblek"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Systém"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Stanice"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Soubor"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -79,7 +154,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Uložit surová data..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -88,7 +163,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Poznámky k verzi"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Nastavení"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -97,9 +172,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentace"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopírovat"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Přihlašování..."; @@ -118,16 +190,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Načítání dat..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Nebyla vrácena žádná data komandéra"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Kdo jste?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Kde zrovna jste?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "S jakou lodí létáte?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -154,114 +223,45 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Vypínání..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jeden nebo více aktivních pluginů ještě stále nepodporuje Python 3.x. Podívejte se na jejich seznam v záložce '{PLUGINS}' v '{FILE}' > '{SETTINGS}'. Zkontrolujte si jestli není dostupná novější verze pluginu, pokud ne, tak kontaktujte vývojáře pluginu o tom, že musí upravit jejich plugin pro Python 3.x.\n\nPlugin můžete vypnout přidáním '{DISABLED}' na konec názvu jeho složky."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy, které nepodporují Python 3.x"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Adresář deníku je již uzamčen"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Chyba: Frontier CAPI neodpovídá"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Nové umístění adresáře deníku je již uzamčeno. {CR} Můžete zkusit tento problém vyřešit a Opakovat, nebo Ignorovat."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Chyba: Server Frontieru laguje"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Opakovat"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Chyba: Chybné přihlašovací údaje"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignorovat"; +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Chyba: Nesprávný CMDR"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Chyba"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Chyba: Nejde ověřit token customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Chyba: customer_id nesouhlasí!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Chyba: nepovedlo se získat token"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Dotaz na Frontier CAPI selhal"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Výchozí"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normal"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Nastavte si URL pro konfiguraci lodi na coriolis.io. Adresa MUSÍ končit '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "Normal URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Reset"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "Beta URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Přepsat volbu Beta/Normal"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Neplatný režim přepisu Coriolis!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Zpracování EDDB deníku je deaktivováno. Zkontrolujte log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Odesílání dat do EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Chyba: Nelze se připojit k EDDN"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Odeslat data o stanici do Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Odeslat sken a data o systému do Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Pozdržet odeslání po zadokování"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "Obsluha EDDN deníku je deaktivována. Zkontrolujte log."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Odesílat letový log a status CMDRa do EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Přihlašovací údaje Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Jméno CMDRa"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API klíč"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Žádná"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "Obsluha EDSM deaktivována. Zkontrolujte log."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Chyba: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Chyba: Nelze se připojit k EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Odesílat letový log a status CMDRa na Inaru"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Přihlašovací údaje k Inaře"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara deaktivována. Zkontrolujte log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Chyba: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Nastavení"; @@ -394,230 +394,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Vypnuté pluginy"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Zůstatek"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Půjčka"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trade"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federation"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Empire"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trade"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federation"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Poddůstojník"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Cena"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Lodě"; diff --git a/L10n/de.strings b/L10n/de.strings index 3ce8c6ce..a1350b05 100644 --- a/L10n/de.strings +++ b/L10n/de.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "Deutsch"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Fehler: Frontier CAPI antwortet nicht"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Daten werden an das EDDN gesendet..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Fehler: Frontier-Server ist überlastet"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Fehler: Keine Verbindung zum EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Angedockt aber unbekannte Station: EDO-Siedlung?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Schicke Stationsdaten an das Elite Dangerous Data Netzwerk"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Fehler: Ungültige Anmeldedaten"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Sende System- und Scandaten zum Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Fehler: Falscher Kdt."; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Senden verzögern bis angedockt"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Fehler"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Sende Fluglog und CMDR-Status an EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Fehler: Konnte das Token customer_id nicht prüfen"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite: Dangerous Star Map Anmeldedaten"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Fehler: customer_id stimmt nicht überein!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Kdt."; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Fehler: konnte Token nicht erhalten"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Kommandantenname"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "Frontier CAPI offline wegen Wartung"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Schlüssel"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Frontier CAPI Anfrage gescheitert"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Keine Zuweisung"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Fehler: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Fehler: Kann keine Verbindung zu EDSM aufbauen"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Sende Fluglog und CMDR-Status an Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara-Anmeldedaten"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Fehler: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normal"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Setze die zu nutzende URL für coriolis.io Schiffsausrüstungen. Beachte, dass sie auf '/import?data=' enden muss."; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "Normale URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Zurücksetzen"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "Beta-URL"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Beta/Standard-Auswahl überschreiben"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Ungültiger Coriolis-Überschreibungsmodus!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "EDDB Journal-Verarbeitung deaktiviert. Siehe Log."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "EDDN Journal-Handler deaktiviert. Siehe Log."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "EDSM-Handler deaktiviert. Siehe Log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara deaktiviert. Siehe Log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Keine Kommandanten-Daten erhalten"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Beta/Normal-Auswahl überschreiben"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN-Fehler: EDMC ist zu alt für EDDN. Bitte aktualisieren."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN-Fehler: Validierung fehlgeschlagen (EDMC zu alt?). Siehe Log"; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "EDDN-Fehler: {STATUS} Statuscode zurückgegeben"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "Kein 'Route'-Array in NavRoute.json enthalten"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Journal-Ordner bereits gesperrt"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Der neue Journal-Ordnerpfad ist bereits gesperrt.{CR}Du kannst entweder versuchen, das zu beheben und es nochmal zu probieren, oder diese Meldung ignorieren."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Wiederholen"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignorieren"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopieren"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Aktualisieren"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Fehler: Prüfe E:D Journal Dateispeicherort"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Kdt."; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rolle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Schiff"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Anzug"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Datei"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Speichere Originaldaten..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Anmerkungen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Einstellungen"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopieren"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Anmelden..."; @@ -142,16 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Daten werden abgerufen..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Keine Kommandanten-Daten erhalten"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Wer bist du?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Wo bist du?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Was fliegst du?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -181,126 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Programm schließt..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Eins oder mehr deiner aktivierten Plugins hat noch keinen Support für Python 3.x. Du kannst dir die Liste im '{PLUGINS}'-Tab unter '{FILE}' > '{SETTINGS}' ansehen. Du solltest prüfen, ob es für diese Updates gibt und ansonsten dem Entwickler Bescheid geben, dass sie ihren Code für Python 3.x aktualisieren müssen.\n\nDu kannst ein Plugin deaktivieren, indem du dessen Ordner ein '{DISABLED}' am Ende des Namens anhängst."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins ohne Python 3.x Support"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Journal-Ordner bereits gesperrt"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Fehler: Frontier CAPI antwortet nicht"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Der neue Journal-Ordnerpfad ist bereits gesperrt.{CR}Du kannst entweder versuchen, das zu beheben und es nochmal zu probieren, oder diese Meldung ignorieren."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Fehler: Frontier-Server ist überlastet"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Wiederholen"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Angedockt aber unbekannte Station: EDO-Siedlung?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignorieren"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Fehler: Ungültige Anmeldedaten"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Fehler: Falscher Kdt."; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Fehler"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Fehler: Konnte das Token customer_id nicht prüfen"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Fehler: customer_id stimmt nicht überein!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Fehler: konnte Token nicht erhalten"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI offline wegen Wartung"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Frontier CAPI Anfrage gescheitert"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standard"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normal"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Setze die zu nutzende URL für coriolis.io Schiffsausrüstungen. Beachte, dass sie auf '/import?data=' enden muss."; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "Normale URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Zurücksetzen"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "Beta-URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Beta/Normal-Auswahl überschreiben"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Ungültiger Coriolis-Überschreibungsmodus!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "EDDB Journal-Verarbeitung deaktiviert. Siehe Log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Daten werden an das EDDN gesendet..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Fehler: Keine Verbindung zum EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN-Fehler: EDMC ist zu alt für EDDN. Bitte aktualisieren."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN-Fehler: Validierung fehlgeschlagen (EDMC zu alt?). Siehe Log"; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "EDDN-Fehler: {STATUS} Statuscode zurückgegeben"; - -/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No 'Route' array in NavRoute.json contents" = "Kein 'Route'-Array in NavRoute.json enthalten"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Schicke Stationsdaten an das Elite Dangerous Data Netzwerk"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Sende System- und Scandaten zum Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Senden verzögern bis angedockt"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "EDDN Journal-Handler deaktiviert. Siehe Log."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Sende Fluglog und CMDR-Status an EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite: Dangerous Star Map Anmeldedaten"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Kommandantenname"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Schlüssel"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Keine Zuweisung"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "EDSM-Handler deaktiviert. Siehe Log."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Fehler: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Fehler: Kann keine Verbindung zu EDSM aufbauen"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Sende Fluglog und CMDR-Status an Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara-Anmeldedaten"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara deaktiviert. Siehe Log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Fehler: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Einstellungen"; @@ -442,236 +445,275 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Deaktivierte Plugins"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Kontostand"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Kredit"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Kampfrang"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Handelsrang"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Erkunderrang"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC-Rang"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Föderation"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Imperium"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Machtspiele"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmlos"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Zumeist Harmlos"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Neuling"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Kompetent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Experte"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Meister"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Gefährlich"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Tödlich"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Kampfrang"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Handelsrang"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Erkunderrang"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Söldner"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Exobiologe"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC-Rang"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Föderation"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Imperium"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Machtspiele"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmlos"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Zumeist Harmlos"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Neuling"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Kompetent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Experte"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Meister"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Gefährlich"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Tödlich"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Bettelarm"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Sehr Arm"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Krämer"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Kleinhändler"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Kaufmann"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Großhändler"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Unternehmer"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Magnat"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Total planlos"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Fast Planlos"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Späher"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Landkundiger"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Wegebner"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pistensucher"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Aufseher"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pionier"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Wehrlos"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Fast Wehrlos"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Anfänger"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Soldat"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Revolverheld"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Ziellos"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Hilflos"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Zumeist Hilflos"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Anfänger"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Halbprofi"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Profi"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Sieger"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Held"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Rekrut"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Kadett"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Fähnrich"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Maat"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Obermaat"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Feldwebel"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Leutnant"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Kapitänleutnant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Korvettenleutnant"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Fregattenkapitän"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Kapitän"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Konteradmiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vizeadmiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Fremder"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Leibeigener"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Knappe"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Ritter"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Fürst"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Graf"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquise"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Herzog"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prinz"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "König"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Wertung 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Wertung 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Wertung 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Wertung 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Wertung 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Status: Dein Kommandanten-Name ist noch nicht bekannt"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Status: Noch keine CAPI-Daten"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Wert"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Schiffe"; diff --git a/L10n/es.strings b/L10n/es.strings index 5cbefc4c..3d1e5143 100644 --- a/L10n/es.strings +++ b/L10n/es.strings @@ -1,35 +1,119 @@ /* Language name */ "!Language" = "Español"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Error: El CAPI de Frontier no respondió"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Enviando datos a EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Error: El servidor de Frontier está retrasado"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Error: No se puede conectar a EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Atracado pero estación desconocida: ¿Asentamiento EDO?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Enviar datos de la estación a Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Error: Credenciales Inválidas"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Enviar datos de sistema y escáner a Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Error: Cmdt Incorrecto"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Retrasar envío hasta el atraque"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Error"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Enviar Registro de Vuelo y estado del CMDT a EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Error: No se pudo comprobar el token customer_id"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Credenciales de Elite Dangerous Star Map"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Error: ¡customer_id no coincide!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdt"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Error: no se pudo conseguir el token"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Nombre de Comandante"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Fallo de consulta del CAPI de Frontier"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "Llave API"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Ninguna"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Error: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Error: No se puede conectar a EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Enviar Registro de Vuelo y estado del CMDT a Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Credenciales de Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Error: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normal"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Configura la URL para usar con equipamiento de naves en coriolis.io. Nota, debe acabar en '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "URL Normal"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Reiniciar"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "URL Beta"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "¡Modo sobrescritura de Coriolis Inválido!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Procesamiento de Journal para EDDB desactivado. Ver Log."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "Manejo de Journal para EDDN desactivado. Ver Log."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "Manejo de Journal para EDSM desactivado. Ver Log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara desactivado. Ver Log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: No se devolvió datos de comandante"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Sobrescribir Selección Beta/Normal"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "Error EDDN: EDMC es demasiado antiguo para EDDN. Actualiza por favor."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Error EDDN: Validación Fallida (¿EDMC Demasiado Antiguo?). Revisa el Log"; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "Error EDDN: Devolvió código de estado {STATUS}"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "El Directorio Journal ya está bloqueado"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "La localización Directorio Journal ya está bloqueada.{CR}Puedes intentar resolverlo y pulsar Reintentar, o elegir Ignorar esto."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Reintentar"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignorar"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Copiar"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Actualizar"; @@ -43,25 +127,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Error: Comprueba la localización del fichero journal de E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdt"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Nave"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Estación"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Archivo"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -85,7 +166,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Guardar Datos Sin Procesar..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Estado"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -94,7 +175,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notas de la versión"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Configuración"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -103,9 +184,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentación"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Copiar"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Identificándose..."; @@ -124,16 +202,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Recopilando datos..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: No se devolvió datos de comandante"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "¿Quién eres?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "¿Dónde estás?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "¿Qué estás volando?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -160,123 +235,48 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Apagando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o más de tus plugins habilitados aún no tienen soporte para Python 3.x. Por favor, consulta la lista en la pestaña '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Deberías comprobar si hay una versión actualizada disponible, si no, avisa al desarrollador de que necesita actualizar el código para Python 3.x.\n\nPuedes deshabilitar un plugin cambiando el nombre de su carpeta para que tenga '{DISABLED}' al final del nombre."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Sin Soporte para Python 3.x"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "El Directorio Journal ya está bloqueado"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Error: El CAPI de Frontier no respondió"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "La localización Directorio Journal ya está bloqueada.{CR}Puedes intentar resolverlo y pulsar Reintentar, o elegir Ignorar esto."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Error: El servidor de Frontier está retrasado"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Reintentar"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Atracado pero estación desconocida: ¿Asentamiento EDO?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignorar"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Error: Credenciales Inválidas"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Error: Cmdt Incorrecto"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Error"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Error: No se pudo comprobar el token customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Error: ¡customer_id no coincide!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Error: no se pudo conseguir el token"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Fallo de consulta del CAPI de Frontier"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Por defecto"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normal"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Configura la URL para usar con equipamiento de naves en coriolis.io. Nota, debe acabar en '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "URL Normal"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Reiniciar"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "URL Beta"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Sobrescribir Selección Beta/Normal"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "¡Modo sobrescritura de Coriolis Inválido!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Procesamiento de Journal para EDDB desactivado. Ver Log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Enviando datos a EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Error: No se puede conectar a EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "Error EDDN: EDMC es demasiado antiguo para EDDN. Actualiza por favor."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Error EDDN: Validación Fallida (¿EDMC Demasiado Antiguo?). Revisa el Log"; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "Error EDDN: Devolvió código de estado {STATUS}"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Enviar datos de la estación a Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Enviar datos de sistema y escáner a Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Retrasar envío hasta el atraque"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "Manejo de Journal para EDDN desactivado. Ver Log."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Enviar Registro de Vuelo y estado del CMDT a EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Credenciales de Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Nombre de Comandante"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "Llave API"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Ninguna"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "Manejo de Journal para EDSM desactivado. Ver Log."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Error: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Error: No se puede conectar a EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Enviar Registro de Vuelo y estado del CMDT a Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Credenciales de Inara"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara desactivado. Ver Log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Error: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferencias"; @@ -409,230 +409,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins Desactivados"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Préstamo"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combate"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Comercio"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Exploración"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federación"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Imperio"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Inofensivo"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Casi inofensivo"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novato"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competente"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Experto"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Maestro"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Peligroso"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Letal"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Élite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combate"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Comercio"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Exploración"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federación"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Imperio"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Inofensivo"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Casi inofensivo"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novato"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competente"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Experto"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Maestro"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Peligroso"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Letal"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Pobre"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Casi pobre"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Buhonero"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Distribuidor"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Mercader"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Bróker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Empresario"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Magnate"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Perdido"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Casi perdido"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Explorador"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Topógrafo"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Rastreador"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Guía"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Descubridor"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pionero"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Indefenso"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Casi indefenso"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Aficionado"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semiprofessional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Profesional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Campeón"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Héroe"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiador"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recluta"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadete"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Guardiamarina"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Sargento"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Sargento primero"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Subteniente"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Alférez de fragata"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Teniente de navío"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Capitán de corbeta"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Capitán de fragata"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Capitán de navío"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Contraalmirante"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vicealmirante"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Almirante"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Forastero"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Siervo"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Escudero"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Caballero"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Señor"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Barón"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Vizconde"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Conde"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Conde Palatino"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marqués"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duque"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Príncipe"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Rey"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Nivel 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Nivel 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Nivel 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Nivel 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Nivel 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Valor"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Naves"; diff --git a/L10n/fi.strings b/L10n/fi.strings index 3ebe807e..12476e48 100644 --- a/L10n/fi.strings +++ b/L10n/fi.strings @@ -1,32 +1,83 @@ /* Language name */ "!Language" = "Suomi"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Virhe: Frontier CAPI ei vastaa."; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Lähetetään tietoja EDDN:ään..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Virhe: Frontierin palvelin vastaa vanhoilla tiedoilla"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Virhe: ei saatu yhteyttä EDDN:ään"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Virhe: kirjautuminen ei kelpaa"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Lähetä asematiedot Elite Dangerous Data Network -palveluun"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Virhe: väärä komentaja"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Lähetä järjestelmä- ja skannaustiedot Elite Dangerous Data Network -palveluun"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Virhe"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Lähetä tiedot vasta telakoitumisen jälkeen"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Virhe: Ei kyetty tarkastamaan polettia customer_id"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Lähetä lentoloki ja komentajatiedot EDSM:ään"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Virhe: customer_id ei löydy vastaavuutta!"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map -kirjautuminen"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Virhe: ei kyetty saamaan polettia"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Frontier CAPI kyselyvirhe."; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Komentajanimi"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API avain"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Ei määritelty"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Virhe: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Virhe: ei saatu yhteyttä EDSM:ään"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Lähetä lentoloki ja komentajatiedot Inaraan"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inaran kirjautuminen"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Inaran virhe: {MSG}"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "EDDB lokikirjan käsittely ei käytössä. Katso lokitiedot."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "EDDB lokikirjan käsittelijä ei käytössä. Katso lokitiedot."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "ESDM käsittelijä ei käytössä. Katso lokitiedot."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara ei käytössä. Katso lokitiedot."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: tietoja ei löytynyt"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Journal -hakemisto on jo lukittu"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Uusi Journal -hakemisto on jo lukittu.{CR}Voit joko yrittää ratkaista tämän ja yrittää uudelleen, tai jättää asian huomiotta."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Yritä uudelleen"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Älä huomioi"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopioi"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Päivitä"; @@ -37,25 +88,22 @@ /* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Tuntematon"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rooli"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Alus"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Asuste"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Järjestelmä"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Asema"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Tiedosto"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -79,7 +127,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Tallenna raakadata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Tila"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -88,7 +136,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Julkaisutiedot"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Valinnat"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -97,9 +145,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentaatio"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopioi"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Kirjaudutaan..."; @@ -118,16 +163,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Noudetaan tietoja..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: tietoja ei löytynyt"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Kuka olet?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Missä olet?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Mitä alusta lennät?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -154,87 +196,45 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Sulkeutuu..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Yksi tai useampi käyttämistäsi lisäosista ei sisällä vielä Pyhton 3.x -tukea. Tarkista tiedoston '{FILE}' > '{SETTINGS}' välilehti '{PLUGINS}' lisäosista, onko niistä uudempaa versiota saatavilla; muussa tapauksessa ota yhteyttä sen kehittäjään ja kerro, että sen lähdekoodi on päivitettävä Python 3.x -tasolle.\n\nVoit estää lisäosan toiminnan nimeämällä sen hakemiston siten, että se päättyy tekstiin '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Lisäosat"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Lisäosat ilman Python 3.x -tukea"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Journal -hakemisto on jo lukittu"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Virhe: Frontier CAPI ei vastaa."; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Uusi Journal -hakemisto on jo lukittu.{CR}Voit joko yrittää ratkaista tämän ja yrittää uudelleen, tai jättää asian huomiotta."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Virhe: Frontierin palvelin vastaa vanhoilla tiedoilla"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Yritä uudelleen"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Virhe: kirjautuminen ei kelpaa"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Älä huomioi"; +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Virhe: väärä komentaja"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Virhe"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Virhe: Ei kyetty tarkastamaan polettia customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Virhe: customer_id ei löydy vastaavuutta!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Virhe: ei kyetty saamaan polettia"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Frontier CAPI kyselyvirhe."; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Oletus"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "EDDB lokikirjan käsittely ei käytössä. Katso lokitiedot."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Lähetetään tietoja EDDN:ään..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Virhe: ei saatu yhteyttä EDDN:ään"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Lähetä asematiedot Elite Dangerous Data Network -palveluun"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Lähetä järjestelmä- ja skannaustiedot Elite Dangerous Data Network -palveluun"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Lähetä tiedot vasta telakoitumisen jälkeen"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "EDDB lokikirjan käsittelijä ei käytössä. Katso lokitiedot."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Lähetä lentoloki ja komentajatiedot EDSM:ään"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map -kirjautuminen"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Komentajanimi"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API avain"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Ei määritelty"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "ESDM käsittelijä ei käytössä. Katso lokitiedot."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Virhe: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Virhe: ei saatu yhteyttä EDSM:ään"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Lähetä lentoloki ja komentajatiedot Inaraan"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inaran kirjautuminen"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara ei käytössä. Katso lokitiedot."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Inaran virhe: {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Valinnat"; @@ -367,230 +367,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Estetyt liitännäiset"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Lainaa jäljellä"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Taistelija -ranking"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Kaupankäynti -ranking"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Tutkimusmatkailija -ranking"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC -ranking"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federaation sotilasarvosi"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Imperiumin sotilasarvosi"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Valtapeli -ranking"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Taistelija -ranking"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Kaupankäynti -ranking"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Tutkimusmatkailija -ranking"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC -ranking"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federaation sotilasarvosi"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Imperiumin sotilasarvosi"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Valtapeli -ranking"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Luokitus 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Luokitus 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Luokitus 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Luokitus 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Luokitus 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Arvo"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Alukset"; diff --git a/L10n/fr.strings b/L10n/fr.strings index 54f7c480..5d7dad8a 100644 --- a/L10n/fr.strings +++ b/L10n/fr.strings @@ -1,14 +1,56 @@ /* Language name */ "!Language" = "Français"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Erreur : Le serveur Frontier ne répond pas"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Envoi des données à EDDN..."; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Erreur : Identifiants invalides"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Erreur : Connexion impossible à EDDN"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Erreur : Cmdr incorrect"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Envoyer les données de la station à Elite Dangerous Data Network"; + +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Envoyer les systèmes et les informations de scan à Elite Dangerous Data Network"; + +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Retarder l'envoi jusqu'à l'amarrage"; + +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Envoyer le journal de vol et le statut Cmdr à EDSM"; + +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Informations d'identification pour Elite Dangerous Star Map"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmd"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Nom du commandant"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "Clé API"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Aucun"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Erreur : EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Erreur : Connexion impossible à EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Envoyer le journal de vol et le statut Cmdr à Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Informations d'identification pour Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Erreur : Inara {MSG}"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Copier"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Mettre à jour"; @@ -16,25 +58,22 @@ /* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Toujours visible"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmd"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rôle"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Vaisseau"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Combinaison"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Système"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Fichier"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -58,7 +97,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Sauvegarder les Données Brutes..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "État"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -67,7 +106,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notes de publication"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Paramètres"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -76,9 +115,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Copier"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Connexion en cours..."; @@ -97,13 +133,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Récupération des données..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Qui êtes-vous ?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Où êtes-vous ?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Avec quoi volez-vous ?"; /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ @@ -124,63 +160,27 @@ /* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Un ou plusieurs de vos plugins activés ne sont pas encore compatibles avec Python 3.x. Regardez la liste sur l'onglet '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Vous devriez vérifier s'il y a une version mise à jour, sinon alertez le développeur qu'il doit mettre à jour le code pour Python 3.x.\n\nVous pouvez désactiver un plugin en renommant son dossier pour qu'il ait '{DISABLED}' à la fin du nom."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins non compatibles avec Python 3.x"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Erreur : Le serveur Frontier ne répond pas"; + +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Erreur : Identifiants invalides"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Erreur : Cmdr incorrect"; + /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Par défaut"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Envoi des données à EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Erreur : Connexion impossible à EDDN"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Envoyer les données de la station à Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Envoyer les systèmes et les informations de scan à Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Retarder l'envoi jusqu'à l'amarrage"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Envoyer le journal de vol et le statut Cmdr à EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Informations d'identification pour Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Nom du commandant"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "Clé API"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Aucun"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Erreur : EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Erreur : Connexion impossible à EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Envoyer le journal de vol et le statut Cmdr à Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Informations d'identification pour Inara"; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Erreur : Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Préférences"; @@ -289,230 +289,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins désactivés"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Solde"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Emprunt"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combattant"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Commerçant"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorateur"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Fédération"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Empire"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Inoffensif"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Bleu"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Compétent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Vilain"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Vétéran"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Létal"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Élite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combattant"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Commerçant"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorateur"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Fédération"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Inoffensif"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Bleu"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Compétent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Vilain"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Vétéran"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Létal"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Sans-le-sou"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mendiant"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Boutiquier"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Revendeur"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Marchand"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Courtier"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Magnat"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Vagabond"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Touriste"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Voyageur"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Éclaireur"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Prospecteur"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Découvreur"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Navigateur"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pionnier"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recrue"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Matelot"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Second Maître"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Premier Maître"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Major"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Enseigne"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Capitaine de Corvette"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Capitaine de Frégate"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Capitaine de Vaisseau"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Contre-Amiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice-Amiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Amiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Étranger"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Écuyer"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Chevalier"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Banneret"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Vicomte"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Comte"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Duc"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Archiduc"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Roi"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rang 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rang 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rang 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rang 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rang 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Valeur"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Vaisseaux"; diff --git a/L10n/hu.strings b/L10n/hu.strings index ba1fd156..34f8d27b 100644 --- a/L10n/hu.strings +++ b/L10n/hu.strings @@ -1,14 +1,56 @@ /* Language name */ "!Language" = "Magyar"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Hiba:Frontier szerver laggol"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Adatok küldése az EDDN-nek..."; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Hiba:Érvénytelen hitelesítő adatok"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Hiba:Nem lehet kapcsolódni az EDDN-hez"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Hiba:Rossz parancsnok"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Állomás adatok küldése az EDDN-nek"; + +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Rendszer és szken adatok küldése az EDDN-nek"; + +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Küldés késletetése amig dokkolsz"; + +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Repülési napló és Parancsnok státusz küldése az EDSM-nek"; + +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Csillag térkép hitelesítése"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Parancsnok"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Parancsnok név"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API kulcs"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Egyik sem"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Hiba:EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Hiba:nem lehet kapcsólodni az EDSM-hez"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Repülési napló és Parancsnok státusz küldése az Inarának"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara hitelesitő adatok"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Hiba:Inara {MSG}"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Másol"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Frissítés"; @@ -16,22 +58,19 @@ /* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Mindig felül"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Parancsnok"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Szerep"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Hajó"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Rendszer"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Állomás"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Fájl"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -55,7 +94,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Nyers adat elmentése"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Státusz"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -64,7 +103,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Kiadási megjegyzések"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Beállítások"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -73,9 +112,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentáció"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Másol"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Bejelentkezés"; @@ -94,13 +130,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Adatok lekérése"; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Ki vagy?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Hol vagy?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Mivel repülsz?"; /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ @@ -121,57 +157,21 @@ /* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Ok"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Pluginok"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Hiba:Frontier szerver laggol"; + +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Hiba:Érvénytelen hitelesítő adatok"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Hiba:Rossz parancsnok"; + /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Alap"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Adatok küldése az EDDN-nek..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Hiba:Nem lehet kapcsolódni az EDDN-hez"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Állomás adatok küldése az EDDN-nek"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Rendszer és szken adatok küldése az EDDN-nek"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Küldés késletetése amig dokkolsz"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Repülési napló és Parancsnok státusz küldése az EDSM-nek"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Csillag térkép hitelesítése"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Parancsnok név"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API kulcs"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Egyik sem"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Hiba:EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Hiba:nem lehet kapcsólodni az EDSM-hez"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Repülési napló és Parancsnok státusz küldése az Inarának"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara hitelesitő adatok"; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Hiba:Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Beállítások"; @@ -274,230 +274,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugin kikapcsolása"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Egyenleg"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Kölcsön"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Harc"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Kereskedés"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Felfedező"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Föderáció"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Birodalom"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "ártalmatlan"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Többnyire ártalmatlan"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Kezdő"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Képesített"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Szakértő"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Mester"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Veszélyes"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Halálos"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elit"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Harc"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Kereskedés"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Felfedező"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Föderáció"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Birodalom"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "ártalmatlan"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Többnyire ártalmatlan"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Kezdő"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Képesített"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Szakértő"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Mester"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Veszélyes"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Halálos"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Nincstelen"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Többnyire nincstelen"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Házaló ügynők"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Kereskedő"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Kereskedő"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Bróker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Vállalkozó"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Iparmágnás"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Céltalan"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Tøbnyire céltalan"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Felderítő"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Megfigyelő"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Útkereső"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Útkereső"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Vándor"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Utász"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "tehetetlen"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Többnyire tehetetlen"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amatőr"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Fél profi"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Szakember"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Bajnok"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hős"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiátor"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Újonc"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Kadét"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Tengerészkadét"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Tizedes"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Törzs zászlós"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Tiszthelyettes"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Zászlós"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Hadnagy"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Főhadnagy"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Ezredes"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Ellentengernagy"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "FőEllentengernagy"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Altengernagy"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admirális"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Kivűlálló"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Jobbágy"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Földesúr"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Lovag"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Báró"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Vicomte"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Számol"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Gróf"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Őrgróf"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Herceg"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Herceg"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Király"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Osztákgozás 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Osztályozás 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Osztályozás 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Osztályozás 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Osztályozás 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Érték"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Hajók"; diff --git a/L10n/it.strings b/L10n/it.strings index 2ecde8cf..b5fa329c 100644 --- a/L10n/it.strings +++ b/L10n/it.strings @@ -1,17 +1,98 @@ /* Language name */ "!Language" = "Italiano"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Errore: il server Frontier sta laggando"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Sto inviando i dati a EDDN..."; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Errore: Credenziali non valide"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Errore: Non riesco a connettermi a EDDN"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Errore: Cmdr sbagliato"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Manda i dati della stazione a Elite Dangerous Data Network"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Errore"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Manda il sistema e i dati scansionati a EDDN"; + +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Ritarda l'invio fino a che si è ormeggiati"; + +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Manda il flight log e lo stato Cmdr a EDSM"; + +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Credenziali per Elite Dangerous Star Map"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Nome Commandante"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Key"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Nessuna"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Errore: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Errore: Non riesco a connettermi a EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Manda il flight log e lo stato Cmdr a Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Credenziali per Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Errore: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normale"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "URL normale"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Reimposta"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "URL Beta"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Elaborazione di EDDB Journal disabilitata. Guarda il Log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara disabilitato. Vedi il Log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Nessun dato sul commandante"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Sovrascrivi selezione Beta/Normale"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "cartella Journal già bloccata"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "La nuova cartella dove risiede il Journal è già bloccata.{CR}Puoi provare a risolvere Riprovando, oppure scegliere di ignorare la cosa."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Riprova"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignora"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Copia"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Recupera"; @@ -22,25 +103,22 @@ /* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Sconosciuto"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Ruolo"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Nave"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Tuta"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Stazione"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "File"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -64,7 +142,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Salva i Dati Grezzi..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -73,7 +151,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Note di rilascio"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Impostazioni"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -82,9 +160,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentazione"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Copia"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Mi sto loggando..."; @@ -103,16 +178,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Sto raccogliendo i dati..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Nessun dato sul commandante"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Chi sei ?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Dove sei finito ?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Stai volando ?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -139,102 +211,30 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Spegnimento..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Uno o più dei tuoi plugin non ha ancora il supporto per Python 3.x. Per favore guarda la lista '{PLUGINS}' nella tab a '{FILE}' > '{SETTINGS}'. Dovresti controllare se ci sono aggiornamenti, altrimenti avvisa gli sviluppatori che devono aggiornare il codice a Python 3.x.\n\nPuoi disabilitare il plugin rinominando la cartella aggiungendo '{DISABLED}' alla fine del nome."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins senza Supporto Python 3.x"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "cartella Journal già bloccata"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Errore: il server Frontier sta laggando"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "La nuova cartella dove risiede il Journal è già bloccata.{CR}Puoi provare a risolvere Riprovando, oppure scegliere di ignorare la cosa."; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Errore: Credenziali non valide"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Riprova"; +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Errore: Cmdr sbagliato"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignora"; +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Errore"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Predefinito"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normale"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "URL normale"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Reimposta"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "URL Beta"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Sovrascrivi selezione Beta/Normale"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Elaborazione di EDDB Journal disabilitata. Guarda il Log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Sto inviando i dati a EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Errore: Non riesco a connettermi a EDDN"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Manda i dati della stazione a Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Manda il sistema e i dati scansionati a EDDN"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Ritarda l'invio fino a che si è ormeggiati"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Manda il flight log e lo stato Cmdr a EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Credenziali per Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Nome Commandante"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Key"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Nessuna"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Errore: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Errore: Non riesco a connettermi a EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Manda il flight log e lo stato Cmdr a Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Credenziali per Inara"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara disabilitato. Vedi il Log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Errore: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferenze"; @@ -367,230 +367,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugin disabilitati"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Prestito"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trade"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federazione"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Impero"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trade"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federazione"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Impero"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Valore"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Navi"; diff --git a/L10n/ja.strings b/L10n/ja.strings index d7f1d0af..8656cfbd 100644 --- a/L10n/ja.strings +++ b/L10n/ja.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "日本語"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "エラー: Frontier CAPIからの応答がありません"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "EDDNにデータ送信中..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "エラー: Frontier社のサーバが混雑しています"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "エラー: EDDNに接続できません"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "不明なステーションに着艦: EDOの基地?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkにステーションデータを送信する"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "エラー: 認証情報に誤りがあります"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkに星系やスキャンした星のデータを送信する"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "エラー: 不適切なCmdr"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "ドッキングするまでデータを送信しない"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "エラー"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "フライトログとCMDRステータスをEDSMへ送信する"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "エラー: customer_idトークンを確認できませんでした"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Mapの認証情報"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "エラー: customer_idがマッチしません!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "コマンダー"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "エラー: トークンが取得できません"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "コマンダー名"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "Frontier CAPIがメンテナンスのため停止中"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "APIキー"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Frontier CAPIクエリ失敗"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "設定なし"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "エラー: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "エラー: EDSMに接続できません"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "フライトログとCMDRステータスをInaraへ送信する"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara認証情報"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "エラー: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "自動"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "通常版"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "ベータ版"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "coriolis.ioの船のロードアウトとして使用するURLを設定してください。URLの最後は「/import?data=」で終わる必要があります"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "通常版URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "リセット"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "ベータ版URL"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "ベータ版/通常版の選択を上書きする"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "無効なCoriolis上書きモードです!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "EDDBジャーナル処理が無効です。ログを確認してください。"; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "EDDNジャーナルハンドラーが無効です。ログを確認してください。"; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "EDSMハンドラーが無効です。ログを確認してください。"; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inaraが無効です。ログを確認してください。"; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: コマンダーのデータが返ってきませんでした"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "ベータ版/通常版の選択を上書きする"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDNエラー: EDDNで使用するにはEDMCのバージョンが古すぎます。更新してください。"; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDNエラー: 検証に失敗しました(EDMCが古すぎる?)。ログを確認してください。"; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "EDDNエラー: ステータスコード {STATUS} が返されました"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "NavRoute.jsonにRoute配列が存在しません"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "ジャーナルディレクトリは既にロックされています"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "新しいジャーナルディレクトリは既にロックされています。{CR}この問題を解決して再試行するか、無視するかを選択してください。"; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "再試行"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "無視"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "コピー"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "更新"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "エラー: E:Dジャーナルファイルの場所を確認してください"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "コマンダー"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "役割"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "船"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "スーツ"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "ステーション"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "ファイル"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "生データの保存..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "ステータス"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "リリースノート"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "設定"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "ドキュメント"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "コピー"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "ログイン中..."; @@ -142,16 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "データを取得中..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: コマンダーのデータが返ってきませんでした"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "どなたですか?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "どこにいますか?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "どの船で飛行していますか?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -181,126 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "終了します..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "有効にしている1つ以上のプラグインがPython 3.xをサポートしていません。'{FILE}' > '{SETTINGS}'\nメニューで表示される設定ダイアログの'{PLUGINS}' タブの一覧を確認してください。更新済みのバージョンがあるかを確認し、なければ開発者にPython 3.xに対応するように開発者に連絡してください。\n\nプラグインを無効にするにはフォルダ名の最後に'{DISABLED}'を追加してください。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "プラグイン"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: プラグインがPython 3.xをサポートしていません"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "ジャーナルディレクトリは既にロックされています"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "エラー: Frontier CAPIからの応答がありません"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "新しいジャーナルディレクトリは既にロックされています。{CR}この問題を解決して再試行するか、無視するかを選択してください。"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "エラー: Frontier社のサーバが混雑しています"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "再試行"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "不明なステーションに着艦: EDOの基地?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "無視"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "エラー: 認証情報に誤りがあります"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "エラー: 不適切なCmdr"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "エラー"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "エラー: customer_idトークンを確認できませんでした"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "エラー: customer_idがマッチしません!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "エラー: トークンが取得できません"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPIがメンテナンスのため停止中"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Frontier CAPIクエリ失敗"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "デフォルト"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "自動"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "通常版"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "ベータ版"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "coriolis.ioの船のロードアウトとして使用するURLを設定してください。URLの最後は「/import?data=」で終わる必要があります"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "通常版URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "リセット"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "ベータ版URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "ベータ版/通常版の選択を上書きする"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "無効なCoriolis上書きモードです!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "EDDBジャーナル処理が無効です。ログを確認してください。"; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "EDDNにデータ送信中..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "エラー: EDDNに接続できません"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDNエラー: EDDNで使用するにはEDMCのバージョンが古すぎます。更新してください。"; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDNエラー: 検証に失敗しました(EDMCが古すぎる?)。ログを確認してください。"; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "EDDNエラー: ステータスコード {STATUS} が返されました"; - -/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No 'Route' array in NavRoute.json contents" = "NavRoute.jsonにRoute配列が存在しません"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkにステーションデータを送信する"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkに星系やスキャンした星のデータを送信する"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "ドッキングするまでデータを送信しない"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "EDDNジャーナルハンドラーが無効です。ログを確認してください。"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "フライトログとCMDRステータスをEDSMへ送信する"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Mapの認証情報"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "コマンダー名"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "APIキー"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "設定なし"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "EDSMハンドラーが無効です。ログを確認してください。"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "エラー: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "エラー: EDSMに接続できません"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "フライトログとCMDRステータスをInaraへ送信する"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara認証情報"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inaraが無効です。ログを確認してください。"; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "エラー: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "環境設定"; @@ -442,236 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "無効なプラグイン"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "口座残高"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "負債"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "戦闘ランク"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "交易ランク"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "探索ランク"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQCランク"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "連邦ランク"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "帝国ランク"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "パワープレイ"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "戦闘ランク"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "交易ランク"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "探索ランク"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Mercenary"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Exobiologist"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQCランク"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "連邦ランク"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "帝国ランク"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "パワープレイ"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Mostly Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Rookie"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Soldier"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Gunslinger"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Warrior"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Deadeye"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Mostly Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Compiler"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Collector"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Cataloguer"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Taxonomist"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Ecologist"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Geneticist"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "状態: あなたのコマンダー名が不明です"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "状態: CAPIデータがありません"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "価値"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "所有船"; diff --git a/L10n/ko.strings b/L10n/ko.strings index 7767dc4a..b7d9032e 100644 --- a/L10n/ko.strings +++ b/L10n/ko.strings @@ -1,38 +1,119 @@ /* Language name */ "!Language" = "한국어(Korean)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "오류: Frontier CAPI가 응답이 없음"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "EDDN에 정보 전송하는 중..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "오류: Frontier 서버 응답이 지연되고 있음"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "오류: EDDN에 연결할 수 없음"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "알 수 없는 정거장에 도킹함: Odyssey 지상 기지입니까?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 스테이션 정보 전송하기"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "오류: 잘못된 자격 증명"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 시스템 및 스캔 정보 전송하기"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "오류: 잘못된 커맨더"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "도킹시까지 서버에 정보 전송을 미루기"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "오류"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "EDSM에 flight 로그와 커맨더 상태 정보 전송하기"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "오류: customer_id 토큰을 확인할 수 없었음"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map 계정"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "오류: customer_id가 일치하지 않습니다!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "커맨더"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "오류: 토큰을 받지 못함"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "커맨더 이름"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "Frontier CAPI 점검으로 접속 불가"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API 키"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Frontier CAPI 쿼리 실패"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "없음"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "오류: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "오류: EDSM에 연결할 수 없음"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Inara에 flight 로그와 커맨더 상태 정보 전송하기"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara 계정 정보"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "오류: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "자동"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "일반"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "베타"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "함선 피팅을 내보낼 coriolis.io 사이트 URL을 설정하세요. 주소는 반드시 '/import?data='으로 끝나야 합니다"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "일반 URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "초기화"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "베타 URL"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "잘못된 Coriolis 오버라이딩 모드입니다!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "EDDB 저널 처리 비활성화됨. 로그 참고 바람."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "EDDN 저널 처리 비활성화됨. 로그 참고 바람."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "EDSM Handler 비활성화됨. 로그 참고 바람."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara 비활성화됨. 로그 참고 바람."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: 커맨더 정보가 반환되지 않음"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "베타/일반 설정 오버라이딩"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 오류: EDDN에 접속하기에 EDMC의 버전이 너무 오래되었습니다. 업데이트하시기 바랍니다."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 오류: 인증 실패 (EDMC가 너무 오래되었을 수 있음). 로그 참고"; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "EDDN 오류: 상태 코드 {STATUS}가 반환됨"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "저널 디렉터리가 이미 잠김"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "새 저널 디렉토리(Journal Directory)가 이미 잠겨있습니다.{CR}문제 해결을 시도하고 재시도하거나, 무시하는 방법이 있습니다."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "재시도"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "무시하기"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "복사"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "새로 고침"; @@ -46,25 +127,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "오류: E:D 저널 파일의 위치를 확인하십시오"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "커맨더"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Role"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "함선"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "슈트"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "성계"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "스테이션"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "파일"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +166,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Raw 데이터 저장하기..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "상태"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +175,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "릴리즈 노트"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "설정"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +184,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "문서 자료"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "복사"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "로그인하는 중..."; @@ -142,16 +217,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "데이터 가져오는 중..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: 커맨더 정보가 반환되지 않음"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "당신은 누구시죠?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "어디 계신거죠?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "지금 어떤 함선을 몰고 계신 건가요?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -178,123 +250,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "종료하는 중..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "활성화된 플러그인 중 1개 이상이 Python 3.x를 지원하지 않습니다. '{FILE}' > '{SETTINGS}' 에서 '{PLUGINS}' 탭에 들어가 활성화되어있는 플러그인 목록을 확인하십시오. 플러그인들 중 새 버전이 나온 것이 있는지도 확인해보시고, 만약 3.x를 지원하지도, 새 버전도 없다면 해당 플러그인의 개발자에게 코드를 수정하기를 문의하십시오.\n\n플러그인을 비활성화하려면 '{DISABLED}'를 폴더명 뒤에 추가하면 됩니다."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "플러그인"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Python 3.x을 지원하지 않는 플러그인"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "저널 디렉터리가 이미 잠김"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "오류: Frontier CAPI가 응답이 없음"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "새 저널 디렉토리(Journal Directory)가 이미 잠겨있습니다.{CR}문제 해결을 시도하고 재시도하거나, 무시하는 방법이 있습니다."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "오류: Frontier 서버 응답이 지연되고 있음"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "재시도"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "알 수 없는 정거장에 도킹함: Odyssey 지상 기지입니까?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "무시하기"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "오류: 잘못된 자격 증명"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "오류: 잘못된 커맨더"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "오류"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "오류: customer_id 토큰을 확인할 수 없었음"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "오류: customer_id가 일치하지 않습니다!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "오류: 토큰을 받지 못함"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI 점검으로 접속 불가"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Frontier CAPI 쿼리 실패"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "기본값"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "자동"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "일반"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "베타"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "함선 피팅을 내보낼 coriolis.io 사이트 URL을 설정하세요. 주소는 반드시 '/import?data='으로 끝나야 합니다"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "일반 URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "초기화"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "베타 URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "베타/일반 설정 오버라이딩"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "잘못된 Coriolis 오버라이딩 모드입니다!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "EDDB 저널 처리 비활성화됨. 로그 참고 바람."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "EDDN에 정보 전송하는 중..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "오류: EDDN에 연결할 수 없음"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 오류: EDDN에 접속하기에 EDMC의 버전이 너무 오래되었습니다. 업데이트하시기 바랍니다."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 오류: 인증 실패 (EDMC가 너무 오래되었을 수 있음). 로그 참고"; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "EDDN 오류: 상태 코드 {STATUS}가 반환됨"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 스테이션 정보 전송하기"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Elite Dangerous Data Network에 시스템 및 스캔 정보 전송하기"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "도킹시까지 서버에 정보 전송을 미루기"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "EDDN 저널 처리 비활성화됨. 로그 참고 바람."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "EDSM에 flight 로그와 커맨더 상태 정보 전송하기"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map 계정"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "커맨더 이름"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API 키"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "없음"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "EDSM Handler 비활성화됨. 로그 참고 바람."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "오류: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "오류: EDSM에 연결할 수 없음"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Inara에 flight 로그와 커맨더 상태 정보 전송하기"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara 계정 정보"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara 비활성화됨. 로그 참고 바람."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "오류: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "설정"; @@ -436,236 +436,236 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "비활성 플러그인"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "잔고"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "대출"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trade"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federation"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Empire"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trade"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federation"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "상태: 아직 커맨더 이름이 확인되지 않음"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "상태: 아직 CAPI 정보 없음"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "가치"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "함선(들)"; diff --git a/L10n/lv.strings b/L10n/lv.strings index e5b53fa3..f553dfdd 100644 --- a/L10n/lv.strings +++ b/L10n/lv.strings @@ -1,11 +1,44 @@ /* Language name */ "!Language" = "Latviešu"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Kļūda: Frontier serveris aizkavējas"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Sūta datus uz EDDN..."; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Kļūda: Nederīga lietotāja informācija"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Kļūda: Nevar savienoties ar EDDN"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; + +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; + +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Aizkavēt sūtīšanu līdz nosēšanai"; + +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous zvaigžņu kartes informācija"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Komandiera vārds"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API atslēga"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Neviens"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Kļūda: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Kļūda: Nevar savienoties ar EDSM"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopēt"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Atjaunināt"; @@ -13,22 +46,19 @@ /* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Vienmēr virspusē"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Loma"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Kuģis"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistēma"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Stacija"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Fails"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -52,7 +82,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Saglabāt sākotnējos datus..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Statuss"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -61,7 +91,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informācija par laidienu"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Iestatījumi"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -70,9 +100,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentācija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopēt"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Autorizējas..."; @@ -91,13 +118,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Iegūst datus..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Kas tu esi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Kur tu esi?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Ar ko tu lido?"; /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ @@ -118,45 +145,18 @@ /* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Labi"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Spraudņi"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Kļūda: Frontier serveris aizkavējas"; + +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Kļūda: Nederīga lietotāja informācija"; + /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Noklusējuma"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Sūta datus uz EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Kļūda: Nevar savienoties ar EDDN"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Sūtīt stacijas datus uz Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Aizkavēt sūtīšanu līdz nosēšanai"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous zvaigžņu kartes informācija"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Komandiera vārds"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API atslēga"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Neviens"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Kļūda: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Kļūda: Nevar savienoties ar EDSM"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Iestatījumi"; @@ -253,230 +253,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Atspējoti Spraudņi"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Bilance"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Aizdevums"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trade"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federation"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Empire"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Nekaitīgs"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trade"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federation"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Nekaitīgs"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Bezpalīdzīgs"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Varonis"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiators"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Leitnants"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Bruņinieks"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Karalis"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Vērtība"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Kuģi"; diff --git a/L10n/nl.strings b/L10n/nl.strings index 1a5e1985..c25eddb6 100644 --- a/L10n/nl.strings +++ b/L10n/nl.strings @@ -1,14 +1,56 @@ /* Language name */ "!Language" = "Nederlands"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Fout: Frontier server is vertraagd"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Bezig data te versturen naar EDDN..."; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Fout: Ongeldige inlog gegevens"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Fout: Kan geen verbinding maken met EDDN"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Fout: Verkeerde Cmdr"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Stuur station gegevens naar het Elite Dangerous Data Network"; + +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Stuur systeem en scan gegevens naar het Elite Dangerous Data Network"; + +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Stel verzending uit tot na het docken"; + +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Stuur vlucht logboek en Cmdr status naar EDSM"; + +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map inlog gegevens"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Commander naam"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Key"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Geen"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Fout: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Fout: Kan geen verbinding maken met EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Stuur vlucht logboek en Cmdr status naar Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara inlog gegevens"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Fout: Inara {MSG}"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopieëren"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Bijwerken"; @@ -16,22 +58,19 @@ /* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Altijd op voorgrond"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rol"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Schip"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Systeem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Bestand"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -55,7 +94,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Sla onbewerkte gegevens op..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -64,7 +103,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Release opmerkingen"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Instellingen"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -73,9 +112,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentatie"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopieëren"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Bezig met inloggen..."; @@ -94,13 +130,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Data wordt opgehaald..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Wie ben je?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Waar ben je?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Waar vlieg je in?!"; /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ @@ -121,63 +157,27 @@ /* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Een of meer ingeschakelde plugins hebben nog geen Python 3.x ondersteuning. Kijk op de lijst op de '{PLUGINS}' tab van '{FILE}' > '{SETTINGS}'. Check of er een bijgewerkte versie beschikbaar is. Laat anders de developer weten dat ze de code moeten updaten voor Python 3.x.\n\nJe kan de plugin uitschakelen door het mapje te hernoemen met '{DISABLED}' aan het eind van de naam."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMS: Plugins zonder Python 3.x ondersteuning"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Fout: Frontier server is vertraagd"; + +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Fout: Ongeldige inlog gegevens"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Fout: Verkeerde Cmdr"; + /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standaard"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Bezig data te versturen naar EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Fout: Kan geen verbinding maken met EDDN"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Stuur station gegevens naar het Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Stuur systeem en scan gegevens naar het Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Stel verzending uit tot na het docken"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Stuur vlucht logboek en Cmdr status naar EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map inlog gegevens"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Commander naam"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Key"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Geen"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Fout: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Fout: Kan geen verbinding maken met EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Stuur vlucht logboek en Cmdr status naar Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara inlog gegevens"; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Fout: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferences"; @@ -289,230 +289,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Gedeactiveerde plugins"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Balans"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Lening"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Gevechts rang"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Handels rang"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Ontdekkingsreiziger rang"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federation"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Empire"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Gevechts rang"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Handels rang"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Ontdekkingsreiziger rang"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federation"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Waarde"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Schepen"; diff --git a/L10n/pl.strings b/L10n/pl.strings index 6e4f7244..3c349603 100644 --- a/L10n/pl.strings +++ b/L10n/pl.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "Polski"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Błąd: Brak odpowiedzi od CAPI Frontier"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Wysłanie danych do EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Błąd: Serwer Frontiera laguje"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Błąd: Brak połączenia z EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Zadokowany na nieznanej stacji: czyżby kolonia EDO?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Wyślij dane do Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Błąd: Dane uwierzytelniające niepoprawne"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Wyślij dane skanowań do EDDN"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Błąd: Niepoprawny Cmdr"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Czekaj z wysłaniem na zadokowanie"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Błąd"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Wyślij zapis lotu i status pilota do EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Błąd: Nie można sprawdzić ID klienta z tokenu"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Dane uwierzytelniające Elite Dangerous Star Map"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Błąd: ID klienta nie pasuje!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Błąd: Nie można pobrać tokenu"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Commander Name"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "CAPI w trakcie prac serwisowych"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "Klucz API"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Błąd zapytania CAPI Frontier"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Brak"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Błąd: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Błąd: Brak połączenia z EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Wyślij zapis lotu i status pilota do Inary"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara - uprawnienia"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Błąd: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normalny"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Ustaw URL do wykorzystania z coriolis.io. Pamiętaj, że musi się on kończyć '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "URL normalnej wersji"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Reset"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "URL wersji Beta"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Zastąp wybór Beta/Normalny"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Niewłaściwy tryb nadpisania Coriolis!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Wyłączone przetwarzanie dziennika EDDB. Sprawdź logi."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "Wyłączona obsługa dziennika EDDB. Sprawdź logi."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "Wyłączona obsługa EDDB. Sprawdź logi."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara jest wyłączona. Sprawdź logi."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Nie zwrócono danych dowódcy"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Nadpisz wybór trybu Beta/normalnego"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "Błąd EDDN: Zbyt stara wersja EDMC. Zaktualizuj do nowszej wersji."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Błąd EDDN: Nieudana weryfikacja (stara wersja EDDN?). Sprawdź logi."; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "Błąd EDDN: Zwrócono kod {STATUS}"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "Brak tablicy \"Route\" wewnątrz NavRoute.json"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Katalog dziennika zablokowany"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Nowa pozycja katalogu dziennika jest zablokowana. {CR}Możesz spróbować to rozwiązać na własną rękę lub zignorować."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Ponów"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Zignoruj"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopiuj"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Aktualizacja"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Błąd: Sprawdź lokalizację pliku dziennika E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Rola"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Statek"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Kombinezon"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Stacja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Plik"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Zapisz Nieprzetworzone Dane..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informacje o wersji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Ustawienia"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacja"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopiuj"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Logowanie..."; @@ -142,16 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Pobieranie danych..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Nie zwrócono danych dowódcy"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Kim jesteś?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Gdzie jesteś?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Czym latasz?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -181,126 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Wyłączanie..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Co najmniej jeden z uruchomionych pluginów nie wspiera Python 3.x. Sprawdź listę w '{FILE}' > '{SETTINGS}', sekcja '{PLUGINS}'. Upewnij się, że dostępna jest aktualna wersja pluginu, w przeciwnym razie poinformuj twórcę, że należy zaktualizować kod do wersji Python 3.x.\n\nMożesz wyłączyć plugin, dodając '{DISABLED}' na koniec nazwy jego folderu."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Pluginy"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy Nie Wspierające Python 3.x"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Katalog dziennika zablokowany"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Błąd: Brak odpowiedzi od CAPI Frontier"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Nowa pozycja katalogu dziennika jest zablokowana. {CR}Możesz spróbować to rozwiązać na własną rękę lub zignorować."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Błąd: Serwer Frontiera laguje"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Ponów"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Zadokowany na nieznanej stacji: czyżby kolonia EDO?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Zignoruj"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Błąd: Dane uwierzytelniające niepoprawne"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Błąd: Niepoprawny Cmdr"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Błąd"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Błąd: Nie można sprawdzić ID klienta z tokenu"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Błąd: ID klienta nie pasuje!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Błąd: Nie można pobrać tokenu"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "CAPI w trakcie prac serwisowych"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Błąd zapytania CAPI Frontier"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Domyślne"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normalny"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Ustaw URL do wykorzystania z coriolis.io. Pamiętaj, że musi się on kończyć '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "URL normalnej wersji"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Reset"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "URL wersji Beta"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Nadpisz wybór trybu Beta/normalnego"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Niewłaściwy tryb nadpisania Coriolis!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Wyłączone przetwarzanie dziennika EDDB. Sprawdź logi."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Wysłanie danych do EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Błąd: Brak połączenia z EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "Błąd EDDN: Zbyt stara wersja EDMC. Zaktualizuj do nowszej wersji."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Błąd EDDN: Nieudana weryfikacja (stara wersja EDDN?). Sprawdź logi."; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "Błąd EDDN: Zwrócono kod {STATUS}"; - -/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No 'Route' array in NavRoute.json contents" = "Brak tablicy \"Route\" wewnątrz NavRoute.json"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Wyślij dane do Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Wyślij dane skanowań do EDDN"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Czekaj z wysłaniem na zadokowanie"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "Wyłączona obsługa dziennika EDDB. Sprawdź logi."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Wyślij zapis lotu i status pilota do EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Dane uwierzytelniające Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Commander Name"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "Klucz API"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Brak"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "Wyłączona obsługa EDDB. Sprawdź logi."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Błąd: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Błąd: Brak połączenia z EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Wyślij zapis lotu i status pilota do Inary"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara - uprawnienia"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara jest wyłączona. Sprawdź logi."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Błąd: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferencje"; @@ -442,236 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Pluginy wyłączone"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Saldo"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Pożyczka"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trade"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federacja"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Imperium"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trade"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Najemnik"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Egzobiolog"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federacja"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Imperium"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Bezbronny"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Głównie bezbronny"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Początkujący"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Żołnierz"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Rewolwerowiec"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Wojownik"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Strzelec"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Zagubiony"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Głównie zagubiony"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Wykonawca"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Zbieracz"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Inwentaryzator"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Taksonomista"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Ekolog"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Genetyk"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Ocena 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Ocena 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Ocena 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Ocena 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Ocena 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Status: Nieznana nazwa komandora"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Status: Brak danych CAPI"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Wartość"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Statki"; diff --git a/L10n/pt-BR.strings b/L10n/pt-BR.strings index f8e21e54..07c0e669 100644 --- a/L10n/pt-BR.strings +++ b/L10n/pt-BR.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "Português (Brasil)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Erro: o CAPI da Frontier não respondeu"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Enviando log para o EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Erro: O servidor da Frontier está com lag"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Erro: Não é possível conectar-se ao EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Docado, mas estação desconhecida: assentamento Odyssey?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Enviar log da estação para o EDDN"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Enviar sistemas e dados escaneados para o EDDN"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Erro: Cmdt Errado"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Atrasar o envio até estar docado"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Erro"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Enviar dados de voo e status do cmdt para o EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Erro: não foi possível verificar o token customer_id"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Credenciais do Elite Dangerous Star Map (EDSM)"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Erro: customer_id diferente!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdt"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Erro: não foi possível obter o token"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Nome do Comandante"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "CAPI da Frontier indisponível por manutenção"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "Chave da API"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Falha na requisição ao CAPI da Frontier"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Nenhum"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Erro: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Erro: Não é possível conectar-se ao EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Enviar dados de voo e status do cmdt para o Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Credenciais do Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Erro: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Automático"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normal"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Define a URL a ser usada com coriolis.io. ATENÇÃO: deve terminar com '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "URL Normal"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Redefinir"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "URL Beta"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Substituir Seleção Beta/Normal"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Modo de substituição Coriolis inválido!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Processamento de Jornais no EDDB desativado. Verifique o Log."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "Manipulador de Jornais do EDDN desativado. Verique o Log."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "Manipulador do EDSM desativado. Verifique o Log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara desativado. Verifique o Log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Nenhum dado de comandante retornado"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Substituir Seleção Beta/Normal"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: o EDMC é muito antigo para o EDDN. Por favor, atualize."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (EDMC antigo?). Verifique o log."; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "Erro EDDN: retornou o código {STATUS}."; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "'Rota' não definida em NavRoute.json"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Diretório de Jornais já está bloqueado"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "O novo Diretório de Jornais já está bloqueado.{CR}Você pode resolver o problema e Tentar novamente, ou Ignorar o erro."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Tentar novamente"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignorar"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Copiar"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Atualizar"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Erro: Verifique a localicação dos arquivos de Jornais E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdt"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Nave"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Traje"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Arquivo"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Salvar dados brutos..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notas de atualização"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Configurações"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Copiar"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Efetuando login..."; @@ -142,21 +223,21 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Nenhum dado de comandante retornado"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Quem é você?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Onde está você?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "No que você está voando?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Erro de servidor do CAPI da Frontier"; +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ +"CAPI: Refreshing access token..." = "CAPI: renovando token de acesso..."; + /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Última atualização %H:%M:%S"; @@ -178,123 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Encerrando..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins habilitados não possuem suporte ao Python 3.x. Você pode ver a lista na guia '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Você deve verificar se existe versão atualizada ou então avisar o desenvolvedor de que ele precisa atualizar o código para o Python 3.x.\n\nVocê pode desabilitar um plugin renomeando sua pasta para que seu nome termine com '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem Suporte ao Python 3.x"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Diretório de Jornais já está bloqueado"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Erro: o CAPI da Frontier não respondeu"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "O novo Diretório de Jornais já está bloqueado.{CR}Você pode resolver o problema e Tentar novamente, ou Ignorar o erro."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Erro: O servidor da Frontier está com lag"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Tentar novamente"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Docado, mas estação desconhecida: assentamento Odyssey?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignorar"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Erro: Cmdt Errado"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Erro"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Erro: não foi possível verificar o token customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Erro: customer_id diferente!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Erro: não foi possível obter o token"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "CAPI da Frontier indisponível por manutenção"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Falha na requisição ao CAPI da Frontier"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Padrão"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Automático"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normal"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Define a URL a ser usada com coriolis.io. ATENÇÃO: deve terminar com '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "URL Normal"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Redefinir"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "URL Beta"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Substituir Seleção Beta/Normal"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Modo de substituição Coriolis inválido!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Processamento de Jornais no EDDB desativado. Verifique o Log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Enviando log para o EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Erro: Não é possível conectar-se ao EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: o EDMC é muito antigo para o EDDN. Por favor, atualize."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (EDMC antigo?). Verifique o log."; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "Erro EDDN: retornou o código {STATUS}."; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Enviar log da estação para o EDDN"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Enviar sistemas e dados escaneados para o EDDN"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Atrasar o envio até estar docado"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "Manipulador de Jornais do EDDN desativado. Verique o Log."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Enviar dados de voo e status do cmdt para o EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Credenciais do Elite Dangerous Star Map (EDSM)"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Nome do Comandante"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "Chave da API"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Nenhum"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "Manipulador do EDSM desativado. Verifique o Log."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Erro: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Erro: Não é possível conectar-se ao EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Enviar dados de voo e status do cmdt para o Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Credenciais do Inara"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara desativado. Verifique o Log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Erro: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferências"; @@ -436,236 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins desabilitados"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Balanço"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Empréstimo"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combate"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Comércio"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Exploração"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federação"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Império"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Poderes da galáxia"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Inofensivo"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Quase Inofensivo"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novato"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competente"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Experiente"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Mestre"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Perigoso"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Letal"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combate"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Comércio"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Exploração"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Mercenário"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Exobiologista"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federação"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Império"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Poderes da galáxia"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Inofensivo"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Quase Inofensivo"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novato"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competente"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Experiente"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Mestre"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Perigoso"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Letal"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Pobre"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Quase pobre"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Camelô"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Negociante"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Mercador"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Corretor"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Empresário"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Magnata"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Perdido"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Quase perdido"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Explorador"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Cartógrafo"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Desbravador"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Descobridor"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Patrulheiro"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneiro"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Indefeso"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Quase Indefeso"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Novato"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Soldado"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Pistoleiro"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Guerreiro"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Tiro-certo"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Sem Direção"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Quase Sem Direção"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Compilador"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Colecionador"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Catalogador"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Taxonomista"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Ecologista"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Geneticista"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Indefeso"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Quase Indefeso"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amador"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi-profissional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Profissional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Campeão"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Herói"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiador"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruta"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Aspirante"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Cabo"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Terceiro-Sargento"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Segundo-Sargento"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Primeiro-Sargento"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Suboficial"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Tenente"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Tenente Comandante"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Capitão de Corveta"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Capitão de Fragata"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Contra-Almirante"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice-Almirante"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Almirante"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Forasteiro"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Servo"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Escudeiro"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Cavaleiro"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lorde"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Barão"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Visconde"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Conde"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Marquês"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Duque"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Arqui-Duque"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Príncipe"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Rei"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Nível 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Nível 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Nível 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Nível 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Nível 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Status: Nome de CMDT ainda desconhecido"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Status: ainda sem dados CAPI"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Valor"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Naves"; diff --git a/L10n/pt-PT.strings b/L10n/pt-PT.strings index c8ce1eec..0ee7810f 100644 --- a/L10n/pt-PT.strings +++ b/L10n/pt-PT.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "Português (Portugal)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Erro: CAPI da Frontier não respondeu."; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "A enviar dados para o EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Erro: O servidor da Frontier está atrasado"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Erro: Não é possível conectar ao EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Atracado numa estação desconhecida. É uma colónia EDO?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Enviar dados da estação para o Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Envia dados do Sistema e Scans efectuados para o Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Erro: Cmdt errado"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Atrasar o envio até estar atracado"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Erro"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Enviar dados de voo e o estado do CMDT para o EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Erro: Impossível verificar o token de customer_id"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Credenciais do Elite Dangerous Star Map (EDSM)"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Erro: customer_id não foi encontrado!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdt"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Erro: Não é possível obter o token"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Nome do Comandante"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "CAPI da Frontier em manutenção."; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "Chave API"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Falha ao consultar a CAPI da Frontier."; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Nenhum"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Erro: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Erro: Não é possível conectar ao EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Enviar dados de voo e o estado do CMDT para o Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Credenciais Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Erro: Inara: {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normal"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Definir URL a usar com os módulos da nave do coriolis.io. Notar que isto TEM de acabar em '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "URL Normal"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Redefinir"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "URL Beta"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Sobrepor selecção Beta/Normal"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Modo de sobreposição Coriolis inválido!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Processamento do diário do EDDB desactivado. Verifique o ficheiro de registos."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "Gestor do diário do EDDN desactivado. Verifique o ficheiro de registos."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "Gestor do EDSM desactivado. Verifique o ficheiro de registos."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara desactivado. Verifique o ficheiro de registos."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Dados do Comandante não recebidos"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Sobrepor selecção Beta/Normal"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: Versão do EDMC é demasiado antiga para usar com a EDDN. Por favor actualize."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (Versão do EDMC demasiado antiga?). Verifique os ficheiros de registo."; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "Erro EDDN: Recebido código de estado {STATUS}"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "Nenhuma série 'Route' encontrada em NavRoute.json"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Directório do Diário já se encontra bloqueado"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "O novo directório do Diário já se encontra bloqueado.{CR}Pode tentar resolver este problema e depois Tentar Novamente, ou Ignorar isto."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Tentar Novamente"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignorar"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Copiar"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Actualizar"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Erro: Verifique a localização do ficheiro do diário E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdt"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Função"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Nave"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Fato"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistema"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Estação"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Ficheiro"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Salvar dados em bruto..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Estado"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Notas da Versão"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Definições"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Documentação"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Copiar"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Realizando login..."; @@ -142,21 +223,21 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Obtendo dados..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Dados do Comandante não recebidos"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Quem é você?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Onde é que está?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "No que é que está a voar?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Erro do servidor CAPI da Frontier."; +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ +"CAPI: Refreshing access token..." = "CAPI: Renovando a chave de acesso"; + /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "Última actualização: %H:%M:%S"; @@ -178,123 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "A Desligar..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Um ou mais dos plugins activados não possui ainda suporte para Python 3.x. Por favor verifique a lista na aba '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Deverá verificar se está disponível uma versão mais actualizada, caso contrário, informe o desenvolvedor de que necessita de actualizar o código para suportar Python 3.x.\n\nPode desactivar um plugin colocando '{DISABLED}' no fim do nome da pasta correspondente."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem suporte para Python 3.x"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Directório do Diário já se encontra bloqueado"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Erro: CAPI da Frontier não respondeu."; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "O novo directório do Diário já se encontra bloqueado.{CR}Pode tentar resolver este problema e depois Tentar Novamente, ou Ignorar isto."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Erro: O servidor da Frontier está atrasado"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Tentar Novamente"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Atracado numa estação desconhecida. É uma colónia EDO?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignorar"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Erro: Credenciais Inválidas"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Erro: Cmdt errado"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Erro"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Erro: Impossível verificar o token de customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Erro: customer_id não foi encontrado!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Erro: Não é possível obter o token"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "CAPI da Frontier em manutenção."; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Falha ao consultar a CAPI da Frontier."; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Predefinido"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normal"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Definir URL a usar com os módulos da nave do coriolis.io. Notar que isto TEM de acabar em '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "URL Normal"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Redefinir"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "URL Beta"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Sobrepor selecção Beta/Normal"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Modo de sobreposição Coriolis inválido!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Processamento do diário do EDDB desactivado. Verifique o ficheiro de registos."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "A enviar dados para o EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Erro: Não é possível conectar ao EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "Erro EDDN: Versão do EDMC é demasiado antiga para usar com a EDDN. Por favor actualize."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Erro EDDN: Validação falhou (Versão do EDMC demasiado antiga?). Verifique os ficheiros de registo."; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "Erro EDDN: Recebido código de estado {STATUS}"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Enviar dados da estação para o Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Envia dados do Sistema e Scans efectuados para o Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Atrasar o envio até estar atracado"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "Gestor do diário do EDDN desactivado. Verifique o ficheiro de registos."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Enviar dados de voo e o estado do CMDT para o EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Credenciais do Elite Dangerous Star Map (EDSM)"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Nome do Comandante"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "Chave API"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Nenhum"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "Gestor do EDSM desactivado. Verifique o ficheiro de registos."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Erro: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Erro: Não é possível conectar ao EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Enviar dados de voo e o estado do CMDT para o Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Credenciais Inara"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara desactivado. Verifique o ficheiro de registos."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Erro: Inara: {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Preferências"; @@ -436,236 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Plugins Desactivados"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Balanço"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Empréstimo"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combate"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Comércio"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Exploração"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federação"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Império"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Jogos de Poder"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Inofensivo"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Praticamente Inofensivo"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novato"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competente"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Perito"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Mestre"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Perigoso"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Mortal"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combate"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Comércio"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Exploração"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Mercenário"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Exobiólogo"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federação"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Império"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Jogos de Poder"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Inofensivo"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Praticamente Inofensivo"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novato"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competente"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Perito"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Mestre"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Perigoso"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Mortal"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Falido"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Praticamente Pobre"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Vendedor"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Negociante"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Mercador"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Corretor"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Empreendedor"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Magnata"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Sem Destino"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Quase sem destino"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Batedor"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Cartógrafo"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Guia"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Descobridor"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Patrulheiro"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneiro"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Indefeso"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Praticamente Indefeso"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Principiante"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Soldado"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Pistoleiro"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Guerreiro"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Atirador Exímio"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Perdido"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Praticamente Perdido"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Compilador"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Colecionador"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Catalogador"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Taxonomista"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Ecologista"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Geneticista"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Indefeso"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Praticamente Indefeso"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amador"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Profissional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Profissional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Campeão"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Herói"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiador"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruta"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadete"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Aspirante"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Subsargento"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Segundo-Sargento"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Sargento-mor"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Subtenente"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Tenente"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Capitão-tenente"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Tenente de Fragata"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Capitão de Fragata"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Contra-Almirante"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice-Almirante"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Almirante"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Forasteiro"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Servo"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Escudeiro"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Cavaleiro"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lorde"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Barão"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Visconde"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Conde"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquês"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duque"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Príncipe"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Rei"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Nível 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Nível 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Nível 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Nível 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Nível 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Estado: Nome de Comandante ainda desconhecido."; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Estado: Ainda sem dados CAPI"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Valor"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Naves"; diff --git a/L10n/ru.strings b/L10n/ru.strings index 48feec49..979f0367 100644 --- a/L10n/ru.strings +++ b/L10n/ru.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "Русский"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Ошибка: CAPI Frontier не отвечает"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Отправка данных на EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Ошибка: сервера Frontier нестабильны"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Ошибка: не удается подключиться к EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Неизвестный тип станции: поселение EDO?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Отправлять информацию о станциях на Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Ошибка: неизвестное имя пользователя или неверный пароль"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Отправлять данные о системе и данные сканирования в Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Ошибка: неверное имя командира"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Отложить отправку данных до завершения стыковки"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Ошибка"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Отправлять данные журнала полёта и информацию статусе командира в EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Ошибка: невозможно проверить токен customer_id"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Учётные данные Elite Dangerous Star Map"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Ошибка: customer_id не совпадает!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "КМДР"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Ошибка: не удается получить токен"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Имя командира"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "Frontier CAPI остановлен для технического обслуживания"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "Ключ API"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Неудача при запросе к Frontier CAPI"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Не назначено"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Ошибка: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Ошибка: не удается подключиться к EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Отправлять данные журнала полёта и информацию статусе командира в Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Учётные данные Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Ошибка: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Автоматический"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Стандартный"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Бета"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Установите URL для импорта сборок кораблей в coriolis.io. URL должен заканчиваться на '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "Стандартный URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Сброс"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "Бета URL"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Режим переопределения URL"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Некорректный режим переопределения URL для coriolis.io"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Обработка журнала EDDB отключена. См. логи."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "Обработчик журнала EDDN отключен. См. логи."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "Обработчик журнала EDSM отключен. См. логи."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara отключена. См. логи."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Нет данных пилота"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Режим переопределения URL"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "Ошибка EDDN: старая версия EDMC, обновитесь до последней."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Ошибка EDDN: Неудачная валидация (старая версия EDMC?). См. логи."; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "Ошибка EDDN: Возвращён статус код {STATUS}"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "Нет Route массива в NavRoute.json"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Каталог журнала уже заблокирован"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Каталог журнала заблокирован..{CR}Вы можете устранить ошибку и нажать \"Повтор\", или игнорировать эту ошибку."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Повтор"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Игнорировать"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Копировать"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Обновить данные"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Ошибка: проверьте расположение журналов E:D"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "КМДР"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Роль"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Корабль"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Станция"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Файл"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Сохранить \"сырые\" данные.."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Статус"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Заметки о текущем релизе"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Настройки"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Информация о плагине"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Копировать"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Идет подключение..."; @@ -142,16 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Получение данных..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Нет данных пилота"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Невозможно определить личность командира!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Невозможно определить местоположение!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Невозможно определить тип корабля!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -181,126 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Выключение..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один или несколько ваших подключённых плагинов ещё не имеют поддержки Python 3.x. Пожалуйста, ознакомьтесь со списком во вкладке '{PLUGINS}' '{FILE}' > '{SETTINGS}'. Вы должны проверить наличие обновлённой версии, в противном случае предупредите разработчика о необходимости обновления кода на Python 3.x.\n\nВы можете отключить плагин, переименовав его папку в '{DISABLED}'."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Плагины"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Без поддержки Python 3.x"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Каталог журнала уже заблокирован"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Ошибка: CAPI Frontier не отвечает"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Каталог журнала заблокирован..{CR}Вы можете устранить ошибку и нажать \"Повтор\", или игнорировать эту ошибку."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Ошибка: сервера Frontier нестабильны"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Повтор"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Неизвестный тип станции: поселение EDO?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Игнорировать"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Ошибка: неизвестное имя пользователя или неверный пароль"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Ошибка: неверное имя командира"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Ошибка"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Ошибка: невозможно проверить токен customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Ошибка: customer_id не совпадает!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Ошибка: не удается получить токен"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI остановлен для технического обслуживания"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Неудача при запросе к Frontier CAPI"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "По умолчанию"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Автоматический"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Стандартный"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Бета"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Установите URL для импорта сборок кораблей в coriolis.io. URL должен заканчиваться на '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "Стандартный URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Сброс"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "Бета URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Режим переопределения URL"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Некорректный режим переопределения URL для coriolis.io"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Обработка журнала EDDB отключена. См. логи."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Отправка данных на EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Ошибка: не удается подключиться к EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "Ошибка EDDN: старая версия EDMC, обновитесь до последней."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "Ошибка EDDN: Неудачная валидация (старая версия EDMC?). См. логи."; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "Ошибка EDDN: Возвращён статус код {STATUS}"; - -/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No 'Route' array in NavRoute.json contents" = "Нет Route массива в NavRoute.json"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Отправлять информацию о станциях на Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Отправлять данные о системе и данные сканирования в Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Отложить отправку данных до завершения стыковки"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "Обработчик журнала EDDN отключен. См. логи."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Отправлять данные журнала полёта и информацию статусе командира в EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Учётные данные Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Имя командира"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "Ключ API"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Не назначено"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "Обработчик журнала EDSM отключен. См. логи."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Ошибка: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Ошибка: не удается подключиться к EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Отправлять данные журнала полёта и информацию статусе командира в Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Учётные данные Inara"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara отключена. См. логи."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Ошибка: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Настройки"; @@ -442,236 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Отключенные плагины"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Баланс"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Долг"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Боевой"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Торговый"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Исследовательский"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Федерация"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Империя"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Ранг у галактических держав"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Безвредный"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "В целом безвредный"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Новичок"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Специалист"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Эксперт"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Мастер"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Опасный"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Смертоносный"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Элита"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Элита I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Элита II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Элита III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Элита IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Элита V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Боевой"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Торговый"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Исследовательский"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Наемник"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Экзобиолог"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Федерация"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Империя"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Ранг у галактических держав"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Безвредный"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "В целом безвредный"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Новичок"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Специалист"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Эксперт"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Мастер"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Опасный"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Смертоносный"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Нищий"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Полунищий"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Мелкий торговец"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Агент"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Коммерсант"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Брокер"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Предприниматель"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Магнат"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Бесцельный"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Почти бесцельный"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Разведчик"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Изыскатель"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Путешественник"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Следопыт"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Скиталец"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Первооткрыватель"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Беззащитный"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "В целом беззащитный"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Новичок"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Солдат"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Стрелок"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Воин"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Меткий глаз"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Беспомощный"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Практически беспомощный"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Компилятор"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Коллекционер"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Каталогизатор"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Таксономист"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Эколог"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Генетик"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Беспомощный"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Почти беспомощный"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Любитель"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Полупрофессионал"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Профессионал"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Чемпион"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Герой"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Гладиатор"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Новобранец"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Кадет"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Гардемарин"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Старшина"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Главный старшина"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Уорент-офицер"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Энсин"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Лейтенант"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Капитан-лейтенант"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Начальник гарнизона"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Командир корабля"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Контр-адмирал"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Вице-адмирал"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Адмирал"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Чужак"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Крепостной"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Оруженосец"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Рыцарь"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Лорд"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Барон"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Виконт"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Граф"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Эрл"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Маркиз"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Герцог"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Принц"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Король"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Ранг 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Ранг 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Ранг 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Ранг 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Ранг 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Статус: На текущий момент имя командира неизвестно"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Статус: На текущий момент данные CAPI отсутствуют"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Стоимость"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Корабли"; diff --git a/L10n/sl.strings b/L10n/sl.strings index 0ea4162e..76209eb6 100644 --- a/L10n/sl.strings +++ b/L10n/sl.strings @@ -1,8 +1,38 @@ /* Language name */ "!Language" = "Slovenščina"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Napaka: napačno uporabniški ime ali geslo"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Pošiljam podatke na EDDN"; + +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Napaka: povezava z EDDN ni mogoča"; + +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Pošlji podatke postaje na EDDN"; + +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "EDStarMap uporabniški podatki"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Commander ime"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API ključ"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Brez"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Napaka: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Napaka: Povezava z EDSM ni mogoča"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopiraj"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Osveži"; @@ -10,22 +40,19 @@ /* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Vedno na vrhu"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Vloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Ladja"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Postaja"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Datoteka"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -49,7 +76,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Shrani Izvirne Podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -58,7 +85,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Opombe ob izdaji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Nastavitve"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -67,9 +94,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopiraj"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Prijava v teku... "; @@ -88,13 +112,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Nalagam podatke..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Kdo si"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Kje se nahajaš"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "S čim letiš"; /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ @@ -106,36 +130,12 @@ /* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "Potrdi"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Napaka: napačno uporabniški ime ali geslo"; + /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Privzeta"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Pošiljam podatke na EDDN"; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Napaka: povezava z EDDN ni mogoča"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Pošlji podatke postaje na EDDN"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "EDStarMap uporabniški podatki"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Commander ime"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API ključ"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Brez"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Napaka: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Napaka: Povezava z EDSM ni mogoča"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Nastavitve"; @@ -205,230 +205,230 @@ /* prefs.py: Label for Settings > Appearance tab; In files: prefs.py:885; */ "Appearance" = "Videz"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Ravnotežje"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Posojilo"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trgovanje"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federacija"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Cesarstvo"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Igra moči"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trgovanje"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federacija"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Cesarstvo"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Igra moči"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Peniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly peniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Enterpreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "LIeutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Read Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serif"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Ocena 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Ocena 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Ocena 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Ocena 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Ocena 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Vrednost"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Ladje"; diff --git a/L10n/sr-Latn-BA.strings b/L10n/sr-Latn-BA.strings index 8c52ff58..9f94d6c3 100644 --- a/L10n/sr-Latn-BA.strings +++ b/L10n/sr-Latn-BA.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "Srpski (Latinica, Bosna i Hercegovina)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Greška: Frontier CAPI nije odgovorio"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Slanje podataka na EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Greška: Frontier server je usporen"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje sa EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Pristali ste, ali stanica je nepoznata: EDO naselje?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Greška: Neispravni kredencijali"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Odgodi slanje do pristajanja"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Greška"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Pošalji log leta i Cmdr status na EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Greška: Nemoguća provjera tokena customer_id"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Kredencijali za Elite Dangerous Star Map"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Greška: Nemoguće dobaviti token"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Ime komandanta"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "Frontier CAPI nedostupan zbog održavanja"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API ključ"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Frontier CAPI neuspješan upit"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Nije definisano"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Greška: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Greška: Nemoguće povezivanje sa EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Pošalji log leta i Cmdr status na Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Kredencijali za Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Greška: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Automatski"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normalni"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Podesite coriolis.io URL koji će se koristiti za brodsku opremu. Napomena: MORA da se završava sa '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "Normalni URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Reset"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "Beta URL"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Režim rada"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Neispravan Coriolis režim rada!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "EDDB obrada journala je deaktivirana. Pogledajte Log."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "EDDN obrada journala je deaktivirana. Pogledajte Log."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "EDSM obrada je deaktivirana. Pogledajte Log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara je deaktivirana. Pogledajte Log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Nema podataka o komandantu"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Režim rada"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspjela (EDMC prestar?). Pogledajte log."; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Statusni kod {STATUS}"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "Nema 'Route' polja u sadržaju NavRoute.json"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Journal direktorijum je već zaključan"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Novi journal direktorijum je već zaključan.{CR}Možete pokušati da riješite problem i Probate ponovo ili da ga Ignorišete."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Probaj ponovo"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignoriši"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopiraj"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Osvježi"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Greška: Provjerite lokaciju E:D journal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Brod"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Odijelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Fajl"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informacije o verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Podešavanja"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopiraj"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Prijavljivanje..."; @@ -142,16 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Nema podataka o komandantu"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Ko ste vi?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Gdje se nalazite?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "U čemu letite?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -181,126 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Zatvaranje programa..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Provjerite da li postoji nadograđena verzija ili obavijesite autora da treba da promijeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Journal direktorijum je već zaključan"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Greška: Frontier CAPI nije odgovorio"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Novi journal direktorijum je već zaključan.{CR}Možete pokušati da riješite problem i Probate ponovo ili da ga Ignorišete."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Greška: Frontier server je usporen"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Probaj ponovo"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Pristali ste, ali stanica je nepoznata: EDO naselje?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignoriši"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Greška: Neispravni kredencijali"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Greška"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Greška: Nemoguća provjera tokena customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Greška: Nemoguće dobaviti token"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI nedostupan zbog održavanja"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Frontier CAPI neuspješan upit"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standardna"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Automatski"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normalni"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Podesite coriolis.io URL koji će se koristiti za brodsku opremu. Napomena: MORA da se završava sa '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "Normalni URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Reset"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "Beta URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Režim rada"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Neispravan Coriolis režim rada!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "EDDB obrada journala je deaktivirana. Pogledajte Log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Slanje podataka na EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje sa EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspjela (EDMC prestar?). Pogledajte log."; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Statusni kod {STATUS}"; - -/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No 'Route' array in NavRoute.json contents" = "Nema 'Route' polja u sadržaju NavRoute.json"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Odgodi slanje do pristajanja"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "EDDN obrada journala je deaktivirana. Pogledajte Log."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Pošalji log leta i Cmdr status na EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Kredencijali za Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Ime komandanta"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API ključ"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Nije definisano"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "EDSM obrada je deaktivirana. Pogledajte Log."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Greška: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Greška: Nemoguće povezivanje sa EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Pošalji log leta i Cmdr status na Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Kredencijali za Inara"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara je deaktivirana. Pogledajte Log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Greška: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Podešavanja"; @@ -442,236 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Deaktivirani dodaci (plugins)"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Balans"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Zajam"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Borba (Combat)"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trgovina (Trade)"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federacija (Federation)"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Imperija (Empire)"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Borba (Combat)"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trgovina (Trade)"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Mercenary"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Exobiologist"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federacija (Federation)"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Imperija (Empire)"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Mostly Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Rookie"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Soldier"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Gunslinger"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Warrior"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Deadeye"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Mostly Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Compiler"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Collector"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Cataloguer"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Taxonomist"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Ecologist"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Geneticist"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Status: još uvijek nije poznato ime komandanta"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Status: još uvijek nema CAPI podataka"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Vrijednost"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Brodovi"; diff --git a/L10n/sr-Latn.strings b/L10n/sr-Latn.strings index 1dfee4cb..189f5192 100644 --- a/L10n/sr-Latn.strings +++ b/L10n/sr-Latn.strings @@ -1,38 +1,125 @@ /* Language name */ "!Language" = "Srpski (Latinica)"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "Greška: Frontier CAPI nije odgovorio"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Slanje podataka na EDDN..."; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Greška: Frontier server je usporen"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje na EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "Dokovan ali stanica nepoznata: EDO Naselje?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Greška: Pogrešni kredencijali"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Odloži slanje pre pristajanja"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Greška"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Pošalji log leta i Cmdr status na EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Greška: Nemoguća provera tokena customer_id"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Kredencijali za Elite Dangerous Star Map"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Greška: nemoguće dobaviti token"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Ime komandira"; -/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:799; */ -"Frontier CAPI down for maintenance" = "Frontier CAPI isključen radi održavanja"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Ključ"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "Greška pri Frontier CAPI upitu"; +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Ništa"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Greška: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Greška: Nemoguće povezivanje na EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Pošalji log leta i Cmdr status na Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara kredencijali"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Greška: Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "Auto"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "Normal"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "Beta"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Postavite URL za korišćenje sa coriolis.io brodskim izborom opreme. Obratite pažnju da ovo MORA da se završi sa '/import?data='"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "Normal URL"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "Resetuj"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "Beta URL"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "Preinači Beta/Normal izbor"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "Pogrešan Coriolis preinačeni mod!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "Obrada žurnala za EDDB je deaktivirana. Pogledajte Log."; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "Obrada žurnala za EDDN je deaktivirana. Pogledajte Log."; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "EDSM obrada je deaktivirana. Pogledajte Log."; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara je deaktivirana. Pogledajte Log."; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Nema podataka o komandiru"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "Preinači Beta/Normal izbor"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspela (EDMC prestar?). Pogledajte log."; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Vraćen {STATUS} statusni kod."; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "Nema 'Route' niza u NavRoute.json sadržaju"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Žurnal direktorijum je već zaključan"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Novi Žurnal direktorijum je već zaključan.{CR}Možete probati da rešite problem i probate ponovo ili da ga ignorišete."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Probaj ponovo"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ignoriši"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopiraj"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Osveži"; @@ -46,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "Greška: Proverite lokaciju E:D žurnal fajla"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Uloga"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Brod"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Odelo"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Sistem"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Stanica"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Fajl"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -88,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Snimi sirove podatke..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -97,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Informacije o ovoj verziji"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Podešavanja"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -106,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentacija"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopiraj"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Prijavljivanje..."; @@ -142,16 +223,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Preuzimanje podataka..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Nema podataka o komandiru"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Ko ste vi?"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Gde se nalazite?"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "U čemu letite?"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ @@ -181,126 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Gasim..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Proverite da li postoji nadograđena verzija ili obavesite autora da treba da promeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Dodaci (plugins)"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Žurnal direktorijum je već zaključan"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "Greška: Frontier CAPI nije odgovorio"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Novi Žurnal direktorijum je već zaključan.{CR}Možete probati da rešite problem i probate ponovo ili da ga ignorišete."; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Greška: Frontier server je usporen"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Probaj ponovo"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "Dokovan ali stanica nepoznata: EDO Naselje?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ignoriši"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Greška: Pogrešni kredencijali"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Greška: Pogrešan Cmdr"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Greška"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Greška: Nemoguća provera tokena customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Greška: customer_id se ne poklapa!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Greška: nemoguće dobaviti token"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI isključen radi održavanja"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "Greška pri Frontier CAPI upitu"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Podrazumevano"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "Auto"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "Normal"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "Beta"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "Postavite URL za korišćenje sa coriolis.io brodskim izborom opreme. Obratite pažnju da ovo MORA da se završi sa '/import?data='"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "Normal URL"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "Resetuj"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "Beta URL"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "Preinači Beta/Normal izbor"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "Pogrešan Coriolis preinačeni mod!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "Obrada žurnala za EDDB je deaktivirana. Pogledajte Log."; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Slanje podataka na EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje na EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN Greška: EDMC je prestar za EDDN. Molimo ažurirajte."; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN Greška: Validacija nije uspela (EDMC prestar?). Pogledajte log."; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "EDDN Greška: Vraćen {STATUS} statusni kod."; - -/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:970; */ -"No 'Route' array in NavRoute.json contents" = "Nema 'Route' niza u NavRoute.json sadržaju"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Odloži slanje pre pristajanja"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "Obrada žurnala za EDDN je deaktivirana. Pogledajte Log."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Pošalji log leta i Cmdr status na EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Kredencijali za Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Ime komandira"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Ključ"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Ništa"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "EDSM obrada je deaktivirana. Pogledajte Log."; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Greška: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Greška: Nemoguće povezivanje na EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Pošalji log leta i Cmdr status na Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara kredencijali"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara je deaktivirana. Pogledajte Log."; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Greška: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Podešavanja"; @@ -442,236 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Deaktivirani dodaci (plugins)"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Balans"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Pozajmica"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Borba (Combat)"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trgovina (Trade)"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Istraživanje (Explorer)"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federacija"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Imperija"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Borba (Combat)"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trgovina (Trade)"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Istraživanje (Explorer)"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "Mercenary"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "Exobiologist"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federacija"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Imperija"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Mostly Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Rookie"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Soldier"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Gunslinger"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Warrior"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Deadeye"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Mostly Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Compiler"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Collector"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Cataloguer"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Taxonomist"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Ecologist"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Geneticist"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rejting 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rejting 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rejting 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rejting 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rejting 5"; -/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:280; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ "Status: Don't yet know your Commander name" = "Status: Još uvek nije poznato ime vašeg komandira"; -/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:288; */ +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ "Status: No CAPI data yet" = "Status: Još uvek nema CAPI podataka"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Vrednost"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Brodovi"; diff --git a/L10n/sv-SE.strings b/L10n/sv-SE.strings index 4a93f01c..8bc2adcc 100644 --- a/L10n/sv-SE.strings +++ b/L10n/sv-SE.strings @@ -1,14 +1,56 @@ /* Language name */ "!Language" = "Svenska"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Fel: Frontier lag på server"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Skickar data till EDDN..."; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Fel: ogiltligt användarnamn eller lösenord"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Fel: Kan inte ansluta till EDDN"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Fel: Fel användare. Har du flera konton eller en gammal API-nyckel från ett nollställt konto?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Skicka stationsdata till Elite Dangerous Data Network"; + +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Skicka system och scan-data till Elite Dangerous Data Network"; + +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Skicka bara uppdateringar till EDDN när du är dockad"; + +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Skicka flight log-data och Cmdr-status till EDSM"; + +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map användaruppgifter"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Cmdr"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "CMDR namn"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Nyckel"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Ingen"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Fel: EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Fel: Kan inte ansluta till EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Skicka flight log-data och Cmdr-status till Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara autentiseringsuppgifter"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Fel: Inara {MSG}"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Kopiera"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Uppdatera"; @@ -16,22 +58,19 @@ /* EDMarketConnector.py: Appearance - Label for checkbox to select if application always on top; prefs.py: Appearance - Label for checkbox to select if application always on top; In files: EDMarketConnector.py:612; prefs.py:867; */ "Always on top" = "Alltid överst"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Cmdr"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Roll"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Skepp"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "System"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Station"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Fil"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -55,7 +94,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Lagra rådata..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Status"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -64,7 +103,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Versionsinformation"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Inställningar"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -73,9 +112,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Dokumentation"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Kopiera"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Loggar in..."; @@ -94,13 +130,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Hämtar data..."; -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Vem är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Vart är du? (felmeddelande)"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "Okänt skepp? (felmeddelande)"; /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ @@ -121,63 +157,27 @@ /* EDMarketConnector.py: Generic 'OK' button label; prefs.py: 'OK' button on Settings/Preferences window; In files: EDMarketConnector.py:1626; prefs.py:306; */ "OK" = "OK"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "En eller flera aktiverade plugins har inte stöd för Python 3.x. Var vänlig kontrollera listan med plugins under fliken '{PLUGINS}' under '{FILE}' > '{SETTINGS}'. Kontrollera om det finns en nyare version tillgänglig eller informera utvecklaren.\n\nDu kan också avaktivera din plugin genom att ändra slutet av namnet på mappen till '{DISABLED}'"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Plugins"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins utan stöd för Python 3.x"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Fel: Frontier lag på server"; + +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Fel: ogiltligt användarnamn eller lösenord"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Fel: Fel användare. Har du flera konton eller en gammal API-nyckel från ett nollställt konto?"; + /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Standard"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Skickar data till EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Fel: Kan inte ansluta till EDDN"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Skicka stationsdata till Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Skicka system och scan-data till Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Skicka bara uppdateringar till EDDN när du är dockad"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Skicka flight log-data och Cmdr-status till EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map användaruppgifter"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "CMDR namn"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Nyckel"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Ingen"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Fel: EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Fel: Kan inte ansluta till EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Skicka flight log-data och Cmdr-status till Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara autentiseringsuppgifter"; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Fel: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Inställningar"; @@ -283,230 +283,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Avaktiverade plugins"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Balance"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Lån"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Combat"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Trade"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Explorer"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "CQC"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Federation"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Empire"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Powerplay"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Combat"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Trade"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Explorer"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "CQC"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Federation"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Empire"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Powerplay"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amatör"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Värde"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Skepp"; diff --git a/L10n/uk.strings b/L10n/uk.strings index 48a1da17..b9f0b914 100644 --- a/L10n/uk.strings +++ b/L10n/uk.strings @@ -1,26 +1,71 @@ /* Language name */ "!Language" = "Українська"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "Помилка: З`єднання з сервером гри з затримками!"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "Відправка даних до EDDN..."; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "Помилка: Невірні облікові дані!"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "Помилка: Немає зв'язку з EDDN!"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "Помилка! Не той обліковий запис!"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "Надсилати дані станцій до Elite Dangerous Data Network"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "Помилка"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "Відправляти систему і результати сканування в Elite Dangerous Data Network"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "Помилка: Не вдалося перевірити токен customer_id"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "Відкласти відправку даних до стикування"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "Error: customer_id не співпадає!"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "Відправляти дані бортового журналу до EDSM"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "Помилка: не вдалося отримати токен"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Дані Elite Dangerous Star Map"; + +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "Км-др"; + +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "Ім`я пілота"; + +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Ключ"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "Нічого"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "Помилка: EDSM {MSG}!"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "Помилка: Немає з`єднання з EDSM!"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "Відправляти дані бортового журналу до Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Обліковий запис Inara"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "Помилка: Inara {MSG}"; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI: Не отримано данних пілота"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "Каталог журналу вже заблокований"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Нове розташування каталогу журналів уже заблоковано. {CR} Ви можете спробувати вирішити це, а потім повторити спробу, або Ігнорувати це."; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "Повторна спроба"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "Ігнорувати"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "Копіювати"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "Оновлення"; @@ -31,25 +76,22 @@ /* EDMarketConnector.py: Unknown suit; In files: EDMarketConnector.py:746; */ "Unknown" = "Невідомо"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "Км-др"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "Посада"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "Корабель"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "Костюм"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "Система"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "Станція"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "Файл"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -73,7 +115,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "Зберегти необроблені дані..."; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "Статус"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -82,7 +124,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "Інформація про реліз"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "Налаштування"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -91,9 +133,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "Документація"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "Копіювати"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "Вхід в..."; @@ -112,16 +151,13 @@ /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "Отримання даних..."; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI: Не отримано данних пілота"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "Хто ти?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "Де ми?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "На чому летимо?!"; /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ @@ -145,75 +181,39 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "Закриття..."; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "Один або кілька увімкнених плагінів ще не підтримують Python 3.x. Перегляньте список на вкладці '{PLUGINS}' в '{FILE}' > '{SETTINGS}'. Ви повинні перевірити, чи є в наявності оновлена ​​версія, інакше повідомити розробника плагіну про те, що їм потрібно оновити код для Python 3.x.\n\nВи можете відключити плагін, перейменувавши його папку додавши '{DISABLED}' в кінці назви."; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "Плагіни"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Плагіни без підтримки Python 3.x!"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "Каталог журналу вже заблокований"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "Помилка: З`єднання з сервером гри з затримками!"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "Нове розташування каталогу журналів уже заблоковано. {CR} Ви можете спробувати вирішити це, а потім повторити спробу, або Ігнорувати це."; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "Помилка: Невірні облікові дані!"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "Повторна спроба"; +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "Помилка! Не той обліковий запис!"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "Ігнорувати"; +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "Помилка"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "Помилка: Не вдалося перевірити токен customer_id"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "Error: customer_id не співпадає!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "Помилка: не вдалося отримати токен"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "Стандартне налаштування"; -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "Відправка даних до EDDN..."; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "Помилка: Немає зв'язку з EDDN!"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "Надсилати дані станцій до Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "Відправляти систему і результати сканування в Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "Відкласти відправку даних до стикування"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "Відправляти дані бортового журналу до EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Дані Elite Dangerous Star Map"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "Ім`я пілота"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Ключ"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "Нічого"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "Помилка: EDSM {MSG}!"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "Помилка: Немає з`єднання з EDSM!"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "Відправляти дані бортового журналу до Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Обліковий запис Inara"; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "Помилка: Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "Уподобання"; @@ -346,230 +346,230 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "Вимкнені плагіни"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "Баланс"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "Борг"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "Бойовий"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "Торговий"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "Дослідницький"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "Близький бій (CQC)"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "Федерація"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "Імперія"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "Змагання"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Безпечний"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Здебільшого Безпечний"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Новачок"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Компетентний"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Експерт"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Майстер"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Небезпечний"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Убивчий"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Еліта"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "Бойовий"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "Торговий"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "Дослідницький"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "Близький бій (CQC)"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "Федерація"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "Імперія"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "Змагання"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Безпечний"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Здебільшого Безпечний"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Новачок"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Компетентний"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Експерт"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Майстер"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Небезпечний"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Убивчий"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Злидень"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Здебільшого Нужденний"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Штовхач"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Дилер"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Торговець"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Брокер"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Підприємець"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Магнат"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Безцільний"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Здебільшого Безцільний"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Розвідник"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Геодезист"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Новатор"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Слідопит"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Рейнджер"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Піонер"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Безпорадний"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Здебільшого Безпомічний"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Аматор"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Напів-професійний"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Професійний"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Чемпіон"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Герой"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Гладіатор"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Рекрут"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Кадет"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Гардемарин"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Унтер Офіцер"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Старший Унтер Офіцер"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Старший сержант"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Прапорщик"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Лейтенант"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Капітан III рангу"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Капітан II рангу"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Капітан I рангу"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Контр-адмірал"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Віце-адмірал"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Адмірал"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Чужинець"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Кріпак"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Зброєносець"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Лицар"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Пан"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Барон"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Віконт"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Граф"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Дворянин"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Маркіз"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Герцог"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Принц"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "Цар"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Рейтинг 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Рейтинг 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Рейтинг 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Рейтинг 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Рейтинг 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "Вартість"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "Кораблі"; diff --git a/L10n/zh-Hans.strings b/L10n/zh-Hans.strings index f00c5f64..fee797f1 100644 --- a/L10n/zh-Hans.strings +++ b/L10n/zh-Hans.strings @@ -1,35 +1,125 @@ /* Language name */ "!Language" = "简体中文"; -/* companion.py: Frontier CAPI didn't respond; In files: companion.py:220; */ -"Error: Frontier CAPI didn't respond" = "错误:Frontier CAPI 无响应"; +/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:212; eddn.py:584; eddn.py:925; load.py:215; load.py:593; load.py:940; eddn.py:252; eddn.py:699; eddn.py:1439; */ +"Sending data to EDDN..." = "正在向 EDDN 发送数据…"; -/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:239; */ -"Error: Frontier server is lagging" = "错误:Frontier 服务器繁忙"; +/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:257; eddn.py:864; eddn.py:898; eddn.py:937; load.py:260; load.py:878; load.py:913; load.py:952; eddn.py:316; eddn.py:1375; eddn.py:1410; eddn.py:1451; */ +"Error: Can't connect to EDDN" = "错误:无法连接到 EDDN"; -/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:255; */ -"Docked but unknown station: EDO Settlement?" = "已靠站但站点未知:可能是 ED: Odyssey 的地面设施?"; +/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:663; load.py:672; eddn.py:1122; */ +"Send station data to the Elite Dangerous Data Network" = "发送站点数据到 Elite Dangerous Data Network"; -/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:265; */ -"Error: Invalid Credentials" = "错误:无效的登录凭证"; +/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:673; load.py:682; eddn.py:1133; */ +"Send system and scan data to the Elite Dangerous Data Network" = "发送星系和扫描数据到 Elite Dangerous Data Network"; -/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:290; */ -"Error: Wrong Cmdr" = "错误:指挥官不一致"; +/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:683; load.py:692; eddn.py:1144; */ +"Delay sending until docked" = "延时更新,靠站时再发送"; -/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:416; companion.py:501; */ -"Error" = "错误"; +/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:197; load.py:197; edsm.py:237; */ +"Send flight log and Cmdr status to EDSM" = "发送航行日志和指挥官状态到 EDSM"; -/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:459; companion.py:464; */ -"Error: Couldn't check token customer_id" = "错误:无法检查 customer_id 令牌"; +/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:206; load.py:206; edsm.py:247; */ +"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map 授权凭证"; -/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:470; */ -"Error: customer_id doesn't match!" = "错误:customer_id 不匹配!"; +/* edsm.py: Game Commander name label in EDSM settings; theme.py: Label for commander name in main window; EDMarketConnector.py: Label for commander name in main window; stats.py: Cmdr stats; In files: edsm.py:216; load.py:216; edsm.py:258; theme.py:227; EDMarketConnector.py:822; stats.py:59; */ +"Cmdr" = "指挥官"; -/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:492; */ -"Error: unable to get token" = "错误:无法获取令牌"; +/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:223; load.py:223; edsm.py:266; */ +"Commander Name" = "指挥官名称"; -/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:811; */ -"Frontier CAPI query failure" = "无法访问 Frontier CAPI"; +/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:230; inara.py:233; load.py:230; load.py:233; edsm.py:274; inara.py:243; */ +"API Key" = "API Key"; + +/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:256; load.py:256; edsm.py:301; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:156; stats.py:175; stats.py:194; stats.py:211; */ +"None" = "无"; + +/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:622; edsm.py:724; load.py:627; load.py:729; edsm.py:747; edsm.py:875; */ +"Error: EDSM {MSG}" = "错误:EDSM {MSG}"; + +/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:658; edsm.py:720; load.py:663; load.py:725; edsm.py:784; edsm.py:870; */ +"Error: Can't connect to EDSM" = "错误:无法连接到 EDSM"; + +/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:215; load.py:215; inara.py:222; */ +"Send flight log and Cmdr status to Inara" = "发送航行日志和指挥官状态到 Inara"; + +/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:225; load.py:225; inara.py:234; */ +"Inara credentials" = "Inara 授权凭证"; + +/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1316; inara.py:1328; load.py:1319; load.py:1331; inara.py:1587; inara.py:1600; */ +"Error: Inara {MSG}" = "错误:Inara {MSG}"; + +/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: load.py:51; load.py:51; load.py:88; load.py:104; load.py:110; coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ +"Auto" = "自动"; + +/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: load.py:51; load.py:88; load.py:102; coriolis.py:53; coriolis.py:99; coriolis.py:115; */ +"Normal" = "普通版"; + +/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: load.py:51; load.py:88; load.py:103; coriolis.py:54; coriolis.py:100; coriolis.py:116; */ +"Beta" = "测试版"; + +/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: load.py:64:66; coriolis.py:69:71; */ +"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "设置链接以使用 coriolis.io 的飞船配置。注意,链接必须以 /import?data= 结尾"; + +/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: load.py:69; coriolis.py:75; */ +"Normal URL" = "普通版链接"; + +/* coriolis.py: Generic 'Reset' button label; In files: load.py:71; load.py:78; coriolis.py:78; coriolis.py:87; */ +"Reset" = "重置"; + +/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: load.py:76; coriolis.py:84; */ +"Beta URL" = "测试版链接"; + +/* In files: load.py:83; */ +"Override Beta/Normal selection" = "覆盖模式选项"; + +/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: load.py:120; coriolis.py:134; */ +"Invalid Coriolis override mode!" = "无效的 Coriolis 覆盖模式!"; + +/* eddb.py: Journal Processing disabled due to an active killswitch; In files: load.py:99; eddb.py:100; */ +"EDDB Journal processing disabled. See Log." = "EDDB Journal Processing 已禁用。请查看诊断日志。"; + +/* eddn.py: Killswitch disabled EDDN; In files: load.py:756; eddn.py:1233; */ +"EDDN journal handler disabled. See Log." = "EDDN Journal Handler 已禁用。请查看诊断日志。"; + +/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: load.py:346; edsm.py:402; */ +"EDSM Handler disabled. See Log." = "EDSM Handler 已禁用。请查看诊断日志。"; + +/* inara.py: INARA support disabled via killswitch; In files: load.py:331; inara.py:341; */ +"Inara disabled. See Log." = "Inara 已禁用。请查看诊断日志。"; + +/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: test_ast_stuff.py:2; EDMarketConnector.py:1047; */ +"CAPI: No commander data returned" = "CAPI:没有指挥官数据"; + +/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ +"Override Beta/Normal Selection" = "覆盖模式选项"; + +/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:334; */ +"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 错误:EDDN 禁止了此旧版本的 EDMC 应用。请更新应用。"; + +/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:340; */ +"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 错误:数据有效性检查失败。可能是 EDMC 应用版本过旧,请查看诊断日志。"; + +/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:345; */ +"EDDN Error: Returned {STATUS} status code" = "EDDN 错误:返回错误代码 {STATUS}"; + +/* eddn.py: No 'Route' found in NavRoute.json file; In files: eddn.py:971; */ +"No 'Route' array in NavRoute.json contents" = "NavRoute.json 文件中没有“Route”数组"; + +/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ +"Journal directory already locked" = "日志目录已被锁定"; + +/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ +"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "新的日志目录位置已被锁定。{CR}你可以尝试解锁并“重试”以解决此问题,或者选择“忽略”。"; + +/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ +"Retry" = "重试"; + +/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ +"Ignore" = "忽略"; + +/* ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; In files: ttkHyperlinkLabel.py:42; EDMarketConnector.py:866; */ +"Copy" = "复制"; /* EDMarketConnector.py: Update button in main window; In files: EDMarketConnector.py:529; EDMarketConnector.py:828; EDMarketConnector.py:1520; */ "Update" = "更新"; @@ -43,25 +133,22 @@ /* EDMarketConnector.py: ED Journal file location appears to be in error; In files: EDMarketConnector.py:815; */ "Error: Check E:D journal file location" = "错误:请检查 E:D 日志文件位置"; -/* EDMarketConnector.py: Label for commander name in main window; edsm.py: Game Commander name label in EDSM settings; stats.py: Cmdr stats; theme.py: Label for commander name in main window; In files: EDMarketConnector.py:822; edsm.py:257; stats.py:52; theme.py:227; */ -"Cmdr" = "指挥官"; - /* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: Multicrew role label in main window; In files: EDMarketConnector.py:824; EDMarketConnector.py:1279; */ "Role" = "角色"; -/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:367; */ +/* EDMarketConnector.py: 'Ship' or multi-crew role label in main window, as applicable; EDMarketConnector.py: 'Ship' label in main UI; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:824; EDMarketConnector.py:1289; EDMarketConnector.py:1312; stats.py:409; */ "Ship" = "飞船"; /* EDMarketConnector.py: Label for 'Suit' line in main UI; In files: EDMarketConnector.py:825; */ "Suit" = "套装"; -/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:369; */ +/* EDMarketConnector.py: Label for 'System' line in main UI; prefs.py: Configuration - Label for selection of 'System' provider website; stats.py: Main window; In files: EDMarketConnector.py:826; prefs.py:607; stats.py:411; */ "System" = "星系"; -/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:370; */ +/* EDMarketConnector.py: Label for 'Station' line in main UI; prefs.py: Configuration - Label for selection of 'Station' provider website; prefs.py: Appearance - Example 'Normal' text; stats.py: Status dialog subtitle; In files: EDMarketConnector.py:827; prefs.py:625; prefs.py:762; stats.py:412; */ "Station" = "站点"; -/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2015; */ +/* EDMarketConnector.py: 'File' menu title on OSX; EDMarketConnector.py: 'File' menu title; EDMarketConnector.py: 'File' menu; In files: EDMarketConnector.py:830; EDMarketConnector.py:845; EDMarketConnector.py:848; EDMarketConnector.py:2019; */ "File" = "文件"; /* EDMarketConnector.py: 'Edit' menu title on OSX; EDMarketConnector.py: 'Edit' menu title; In files: EDMarketConnector.py:831; EDMarketConnector.py:846; EDMarketConnector.py:849; */ @@ -85,7 +172,7 @@ /* EDMarketConnector.py: File > Save Raw Data...; In files: EDMarketConnector.py:840; EDMarketConnector.py:854; */ "Save Raw Data..." = "保存原始数据…"; -/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:364; */ +/* EDMarketConnector.py: File > Status; stats.py: Status dialog title; In files: EDMarketConnector.py:841; EDMarketConnector.py:853; stats.py:406; */ "Status" = "状态"; /* EDMarketConnector.py: Help > Privacy Policy; In files: EDMarketConnector.py:842; EDMarketConnector.py:860; */ @@ -94,7 +181,7 @@ /* EDMarketConnector.py: Help > Release Notes; In files: EDMarketConnector.py:843; EDMarketConnector.py:861; EDMarketConnector.py:1600; */ "Release Notes" = "更新说明"; -/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2016; prefs.py:255; */ +/* EDMarketConnector.py: File > Settings; prefs.py: File > Settings (macOS); In files: EDMarketConnector.py:855; EDMarketConnector.py:2020; prefs.py:255; */ "Settings" = "设置"; /* EDMarketConnector.py: File > Exit; In files: EDMarketConnector.py:856; */ @@ -103,9 +190,6 @@ /* EDMarketConnector.py: Help > Documentation; In files: EDMarketConnector.py:859; */ "Documentation" = "帮助文档"; -/* EDMarketConnector.py: Label for 'Copy' as in 'Copy and Paste'; ttkHyperlinkLabel.py: Label for 'Copy' as in 'Copy and Paste'; In files: EDMarketConnector.py:866; ttkHyperlinkLabel.py:42; */ -"Copy" = "复制"; - /* EDMarketConnector.py: Status - Attempting to get a Frontier Auth Access Token; In files: EDMarketConnector.py:872; */ "Logging in..." = "登录中…"; @@ -121,24 +205,39 @@ /* EDMarketConnector.py: Status - No station market data from Frontier CAPI; In files: EDMarketConnector.py:932; */ "Station doesn't have a market!" = "此站点没有货物市场!"; +/* EDMarketConnector.py: CAPI queries aborted because Cmdr name is unknown; In files: EDMarketConnector.py:961; */ +"CAPI query aborted: Cmdr name unknown" = "CAPI 访问中止:指挥官名称未知"; + +/* EDMarketConnector.py: CAPI queries aborted because game mode unknown; In files: EDMarketConnector.py:967; */ +"CAPI query aborted: Game mode unknown" = "CAPI 访问中止:游戏模式未知"; + +/* EDMarketConnector.py: CAPI queries aborted because current star system name unknown; In files: EDMarketConnector.py:973; */ +"CAPI query aborted: Current system unknown" = "CAPI 访问中止:现星系名称未知"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in multi-crew on other Cmdr's ship; In files: EDMarketConnector.py:979; */ +"CAPI query aborted: In other-ship multi-crew" = "CAPI 访问中止:正在他人飞船上进行多人共乘 (multi-crew)"; + +/* EDMarketConnector.py: CAPI queries aborted because player is in CQC (Arena); In files: EDMarketConnector.py:985; */ +"CAPI query aborted: CQC (Arena) detected" = "CAPI 访问中止:检测到 CQC (Arena) 正在运行"; + /* EDMarketConnector.py: Status - Attempting to retrieve data from Frontier CAPI; In files: EDMarketConnector.py:1006; */ "Fetching data..." = "取得数据…"; -/* EDMarketConnector.py: No data was returned for the commander from the Frontier CAPI; In files: EDMarketConnector.py:1047; */ -"CAPI: No commander data returned" = "CAPI:没有指挥官数据"; - -/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:298; */ +/* EDMarketConnector.py: We didn't have the commander name when we should have; stats.py: Unknown commander; In files: EDMarketConnector.py:1051; stats.py:335; */ "Who are you?!" = "你是谁?!"; -/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:308; */ +/* EDMarketConnector.py: We don't know where the commander is, when we should; stats.py: Unknown location; In files: EDMarketConnector.py:1057; stats.py:345; */ "Where are you?!" = "你在哪里?!"; -/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:316; */ +/* EDMarketConnector.py: We don't know what ship the commander is in, when we should; stats.py: Unknown ship; In files: EDMarketConnector.py:1064; stats.py:353; */ "What are you flying?!" = "你在飞什么?!"; /* EDMarketConnector.py: Frontier CAPI server error when fetching data; In files: EDMarketConnector.py:1176; */ "Frontier CAPI server error" = "Frontier CAPI 服务器错误"; +/* EDMarketConnector.py: Frontier CAPI Access Token expired, trying to get a new one; In files: EDMarketConnector.py:1182; */ +"CAPI: Refreshing access token..." = "CAPI:获取新的访问令牌中…"; + /* EDMarketConnector.py: Time when we last obtained Frontier CAPI data; In files: EDMarketConnector.py:1226; */ "Last updated at %H:%M:%S" = "最后更新于 %H:%M:%S"; @@ -160,123 +259,51 @@ /* EDMarketConnector.py: The application is shutting down; In files: EDMarketConnector.py:1693; */ "Shutting down..." = "应用关闭中…"; -/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2004:2010; */ +/* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2008:2014; */ "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "一项或多项你所启用的插件尚不支持 Python 3.x,详情请见 {FILE} > {SETTINGS} > {PLUGINS}。请检查上述插件是否有可用的更新,若没有,则应与插件的开发者就 Python 3.x 的支持问题取得联系。\n\n你也可以禁用某一项插件,只需在其文件夹名称的末尾添加 {DISABLED} 即可。"; -/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2014; prefs.py:978; */ +/* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2018; prefs.py:978; */ "Plugins" = "插件"; -/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2025; */ +/* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2029; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC:不支持 Python 3.x 的插件"; -/* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:206; */ -"Journal directory already locked" = "日志目录已被锁定"; +/* companion.py: Frontier CAPI didn't respond; In files: companion.py:218; */ +"Error: Frontier CAPI didn't respond" = "错误:Frontier CAPI 无响应"; -/* journal_lock.py: Text for when newly selected Journal directory is already locked; In files: journal_lock.py:223:224; */ -"The new Journal Directory location is already locked.{CR}You can either attempt to resolve this and then Retry, or choose to Ignore this." = "新的日志目录位置已被锁定。{CR}你可以尝试解锁并“重试”以解决此问题,或者选择“忽略”。"; +/* companion.py: Frontier CAPI data doesn't agree with latest Journal game location; In files: companion.py:237; */ +"Error: Frontier server is lagging" = "错误:Frontier 服务器繁忙"; -/* journal_lock.py: Generic 'Retry' button label; In files: journal_lock.py:228; */ -"Retry" = "重试"; +/* companion.py: Commander is docked at an EDO settlement, got out and back in, we forgot the station; In files: companion.py:253; */ +"Docked but unknown station: EDO Settlement?" = "已靠站但站点未知:可能是 ED: Odyssey 的地面设施?"; -/* journal_lock.py: Generic 'Ignore' button label; In files: journal_lock.py:232; */ -"Ignore" = "忽略"; +/* companion.py: Generic "something went wrong with Frontier Auth" error; In files: companion.py:263; */ +"Error: Invalid Credentials" = "错误:无效的登录凭证"; + +/* companion.py: Frontier CAPI authorisation not for currently game-active commander; In files: companion.py:288; */ +"Error: Wrong Cmdr" = "错误:指挥官不一致"; + +/* companion.py: Generic error prefix - following text is from Frontier auth service; In files: companion.py:414; companion.py:499; */ +"Error" = "错误"; + +/* companion.py: Frontier auth, no 'usr' section in returned data; companion.py: Frontier auth, no 'customer_id' in 'usr' section in returned data; In files: companion.py:457; companion.py:462; */ +"Error: Couldn't check token customer_id" = "错误:无法检查 customer_id 令牌"; + +/* companion.py: Frontier auth customer_id doesn't match game session FID; In files: companion.py:468; */ +"Error: customer_id doesn't match!" = "错误:customer_id 不匹配!"; + +/* companion.py: Failed to get Access Token from Frontier Auth service; In files: companion.py:490; */ +"Error: unable to get token" = "错误:无法获取令牌"; + +/* companion.py: Frontier CAPI returned 418, meaning down for maintenance; In files: companion.py:797; */ +"Frontier CAPI down for maintenance" = "Frontier CAPI 下线维护"; + +/* companion.py: Frontier CAPI data retrieval failed; In files: companion.py:809; */ +"Frontier CAPI query failure" = "无法访问 Frontier CAPI"; /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:194; prefs.py:468; prefs.py:702; prefs.py:735; */ "Default" = "默认"; -/* coriolis.py: 'Auto' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - auto; In files: coriolis.py:52; coriolis.py:55; coriolis.py:101; coriolis.py:117; coriolis.py:123; */ -"Auto" = "自动"; - -/* coriolis.py: 'Normal' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - normal; In files: coriolis.py:53; coriolis.py:99; coriolis.py:115; */ -"Normal" = "普通版"; - -/* coriolis.py: 'Beta' label for Coriolis site override selection; coriolis.py: Coriolis normal/beta selection - beta; In files: coriolis.py:54; coriolis.py:100; coriolis.py:116; */ -"Beta" = "测试版"; - -/* coriolis.py: Settings>Coriolis: Help/hint for changing coriolis URLs; In files: coriolis.py:69:71; */ -"Set the URL to use with coriolis.io ship loadouts. Note that this MUST end with '/import?data='" = "设置链接以使用 coriolis.io 的飞船配置。注意,链接必须以 /import?data= 结尾"; - -/* coriolis.py: Settings>Coriolis: Label for 'NOT alpha/beta game version' URL; In files: coriolis.py:75; */ -"Normal URL" = "普通版链接"; - -/* coriolis.py: Generic 'Reset' button label; In files: coriolis.py:78; coriolis.py:87; */ -"Reset" = "重置"; - -/* coriolis.py: Settings>Coriolis: Label for 'alpha/beta game version' URL; In files: coriolis.py:84; */ -"Beta URL" = "测试版链接"; - -/* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:94; */ -"Override Beta/Normal Selection" = "覆盖模式选项"; - -/* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:134; */ -"Invalid Coriolis override mode!" = "无效的 Coriolis 覆盖模式!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:100; */ -"EDDB Journal processing disabled. See Log." = "EDDB Journal Processing 已禁用。请查看诊断日志。"; - -/* eddn.py: Status text shown while attempting to send data; In files: eddn.py:251; eddn.py:698; eddn.py:1438; */ -"Sending data to EDDN..." = "正在向 EDDN 发送数据…"; - -/* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:315; eddn.py:1374; eddn.py:1409; eddn.py:1450; */ -"Error: Can't connect to EDDN" = "错误:无法连接到 EDDN"; - -/* eddn.py: EDDN has banned this version of our client; In files: eddn.py:333; */ -"EDDN Error: EDMC is too old for EDDN. Please update." = "EDDN 错误:EDDN 禁止了此旧版本的 EDMC 应用。请更新应用。"; - -/* eddn.py: EDDN returned an error that indicates something about what we sent it was wrong; In files: eddn.py:339; */ -"EDDN Error: Validation Failed (EDMC Too Old?). See Log" = "EDDN 错误:数据有效性检查失败。可能是 EDMC 应用版本过旧,请查看诊断日志。"; - -/* eddn.py: EDDN returned some sort of HTTP error, one we didn't expect. {STATUS} contains a number; In files: eddn.py:344; */ -"EDDN Error: Returned {STATUS} status code" = "EDDN 错误:返回错误代码 {STATUS}"; - -/* eddn.py: Enable EDDN support for station data checkbox label; In files: eddn.py:1121; */ -"Send station data to the Elite Dangerous Data Network" = "发送站点数据到 Elite Dangerous Data Network"; - -/* eddn.py: Enable EDDN support for system and other scan data checkbox label; In files: eddn.py:1132; */ -"Send system and scan data to the Elite Dangerous Data Network" = "发送星系和扫描数据到 Elite Dangerous Data Network"; - -/* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:1143; */ -"Delay sending until docked" = "延时更新,靠站时再发送"; - -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:1232; */ -"EDDN journal handler disabled. See Log." = "EDDN Journal Handler 已禁用。请查看诊断日志。"; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:236; */ -"Send flight log and Cmdr status to EDSM" = "发送航行日志和指挥官状态到 EDSM"; - -/* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:246; */ -"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map 授权凭证"; - -/* edsm.py: EDSM Commander name label in EDSM settings; In files: edsm.py:265; */ -"Commander Name" = "指挥官名称"; - -/* edsm.py: EDSM API key label; inara.py: Inara API key label; In files: edsm.py:273; inara.py:243; */ -"API Key" = "API Key"; - -/* edsm.py: We have no data on the current commander; prefs.py: No hotkey/shortcut set; stats.py: No rank; In files: edsm.py:300; prefs.py:520; prefs.py:1174; prefs.py:1207; stats.py:119; stats.py:138; stats.py:157; stats.py:174; */ -"None" = "无"; - -/* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:401; */ -"EDSM Handler disabled. See Log." = "EDSM Handler 已禁用。请查看诊断日志。"; - -/* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:746; edsm.py:874; */ -"Error: EDSM {MSG}" = "错误:EDSM {MSG}"; - -/* edsm.py: EDSM Plugin - Error connecting to EDSM API; In files: edsm.py:783; edsm.py:869; */ -"Error: Can't connect to EDSM" = "错误:无法连接到 EDSM"; - -/* inara.py: Checkbox to enable INARA API Usage; In files: inara.py:222; */ -"Send flight log and Cmdr status to Inara" = "发送航行日志和指挥官状态到 Inara"; - -/* inara.py: Text for INARA API keys link ( goes to https://inara.cz/settings-api ); In files: inara.py:234; */ -"Inara credentials" = "Inara 授权凭证"; - -/* inara.py: INARA support disabled via killswitch; In files: inara.py:341; */ -"Inara disabled. See Log." = "Inara 已禁用。请查看诊断日志。"; - -/* inara.py: INARA API returned some kind of error (error message will be contained in {MSG}); In files: inara.py:1580; inara.py:1593; */ -"Error: Inara {MSG}" = "错误:Inara {MSG}"; - /* prefs.py: File > Preferences menu entry for macOS; In files: prefs.py:251; */ "Preferences" = "偏好"; @@ -418,230 +445,302 @@ /* prefs.py: Lable on list of user-disabled plugins; In files: prefs.py:969; */ "Disabled Plugins" = "已禁用插件"; -/* stats.py: Cmdr stats; In files: stats.py:53; */ +/* stats.py: Cmdr stats; In files: stats.py:60; */ "Balance" = "资金结余"; -/* stats.py: Cmdr stats; In files: stats.py:54; */ +/* stats.py: Cmdr stats; In files: stats.py:61; */ "Loan" = "贷款"; -/* stats.py: Ranking; In files: stats.py:59; */ -"Combat" = "战斗等级"; - -/* stats.py: Ranking; In files: stats.py:60; */ -"Trade" = "贸易等级"; - -/* stats.py: Ranking; In files: stats.py:61; */ -"Explorer" = "探索等级"; - -/* stats.py: Ranking; In files: stats.py:62; */ -"CQC" = "竞技场等级"; - -/* stats.py: Ranking; In files: stats.py:63; */ -"Federation" = "联邦军衔"; - -/* stats.py: Ranking; In files: stats.py:64; */ -"Empire" = "帝国头衔"; - -/* stats.py: Ranking; In files: stats.py:65; */ -"Powerplay" = "势力"; - -/* stats.py: Combat rank; In files: stats.py:73; */ -"Harmless" = "Harmless"; - -/* stats.py: Combat rank; In files: stats.py:74; */ -"Mostly Harmless" = "Mostly Harmless"; - -/* stats.py: Combat rank; In files: stats.py:75; */ -"Novice" = "Novice"; - -/* stats.py: Combat rank; In files: stats.py:76; */ -"Competent" = "Competent"; - -/* stats.py: Combat rank; In files: stats.py:77; */ -"Expert" = "Expert"; - -/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:78; stats.py:141; */ -"Master" = "Master"; - -/* stats.py: Combat rank; In files: stats.py:79; */ -"Dangerous" = "Dangerous"; - -/* stats.py: Combat rank; In files: stats.py:80; */ -"Deadly" = "Deadly"; - -/* stats.py: Top rank; In files: stats.py:81; stats.py:92; stats.py:103; stats.py:114; */ +/* stats.py: Top rank; In files: stats.py:65; */ "Elite" = "Elite"; -/* stats.py: Trade rank; In files: stats.py:84; */ +/* stats.py: Top rank +1; In files: stats.py:66; */ +"Elite I" = "Elite I"; + +/* stats.py: Top rank +2; In files: stats.py:67; */ +"Elite II" = "Elite II"; + +/* stats.py: Top rank +3; In files: stats.py:68; */ +"Elite III" = "Elite III"; + +/* stats.py: Top rank +4; In files: stats.py:69; */ +"Elite IV" = "Elite IV"; + +/* stats.py: Top rank +5; In files: stats.py:70; */ +"Elite V" = "Elite V"; + +/* stats.py: Ranking; In files: stats.py:76; */ +"Combat" = "战斗等级"; + +/* stats.py: Ranking; In files: stats.py:77; */ +"Trade" = "贸易等级"; + +/* stats.py: Ranking; In files: stats.py:78; */ +"Explorer" = "探索等级"; + +/* stats.py: Ranking; In files: stats.py:79; */ +"Mercenary" = "佣兵等级"; + +/* stats.py: Ranking; In files: stats.py:80; */ +"Exobiologist" = "生物学者等级"; + +/* stats.py: Ranking; In files: stats.py:81; */ +"CQC" = "竞技场等级"; + +/* stats.py: Ranking; In files: stats.py:82; */ +"Federation" = "联邦军衔"; + +/* stats.py: Ranking; In files: stats.py:83; */ +"Empire" = "帝国头衔"; + +/* stats.py: Ranking; In files: stats.py:84; */ +"Powerplay" = "势力"; + +/* stats.py: Combat rank; In files: stats.py:93; */ +"Harmless" = "Harmless"; + +/* stats.py: Combat rank; In files: stats.py:94; */ +"Mostly Harmless" = "Mostly Harmless"; + +/* stats.py: Combat rank; In files: stats.py:95; */ +"Novice" = "Novice"; + +/* stats.py: Combat rank; In files: stats.py:96; */ +"Competent" = "Competent"; + +/* stats.py: Combat rank; In files: stats.py:97; */ +"Expert" = "Expert"; + +/* stats.py: Combat rank; stats.py: Empire rank; In files: stats.py:98; stats.py:178; */ +"Master" = "Master"; + +/* stats.py: Combat rank; In files: stats.py:99; */ +"Dangerous" = "Dangerous"; + +/* stats.py: Combat rank; In files: stats.py:100; */ +"Deadly" = "Deadly"; + +/* stats.py: Trade rank; In files: stats.py:103; */ "Penniless" = "Penniless"; -/* stats.py: Trade rank; In files: stats.py:85; */ +/* stats.py: Trade rank; In files: stats.py:104; */ "Mostly Penniless" = "Mostly Penniless"; -/* stats.py: Trade rank; In files: stats.py:86; */ +/* stats.py: Trade rank; In files: stats.py:105; */ "Peddler" = "Peddler"; -/* stats.py: Trade rank; In files: stats.py:87; */ +/* stats.py: Trade rank; In files: stats.py:106; */ "Dealer" = "Dealer"; -/* stats.py: Trade rank; In files: stats.py:88; */ +/* stats.py: Trade rank; In files: stats.py:107; */ "Merchant" = "Merchant"; -/* stats.py: Trade rank; In files: stats.py:89; */ +/* stats.py: Trade rank; In files: stats.py:108; */ "Broker" = "Broker"; -/* stats.py: Trade rank; In files: stats.py:90; */ +/* stats.py: Trade rank; In files: stats.py:109; */ "Entrepreneur" = "Entrepreneur"; -/* stats.py: Trade rank; In files: stats.py:91; */ +/* stats.py: Trade rank; In files: stats.py:110; */ "Tycoon" = "Tycoon"; -/* stats.py: Explorer rank; In files: stats.py:95; */ +/* stats.py: Explorer rank; In files: stats.py:113; */ "Aimless" = "Aimless"; -/* stats.py: Explorer rank; In files: stats.py:96; */ +/* stats.py: Explorer rank; In files: stats.py:114; */ "Mostly Aimless" = "Mostly Aimless"; -/* stats.py: Explorer rank; In files: stats.py:97; */ +/* stats.py: Explorer rank; In files: stats.py:115; */ "Scout" = "Scout"; -/* stats.py: Explorer rank; In files: stats.py:98; */ +/* stats.py: Explorer rank; In files: stats.py:116; */ "Surveyor" = "Surveyor"; -/* stats.py: Explorer rank; In files: stats.py:99; */ +/* stats.py: Explorer rank; In files: stats.py:117; */ "Trailblazer" = "Trailblazer"; -/* stats.py: Explorer rank; In files: stats.py:100; */ +/* stats.py: Explorer rank; In files: stats.py:118; */ "Pathfinder" = "Pathfinder"; -/* stats.py: Explorer rank; In files: stats.py:101; */ +/* stats.py: Explorer rank; In files: stats.py:119; */ "Ranger" = "Ranger"; -/* stats.py: Explorer rank; In files: stats.py:102; */ +/* stats.py: Explorer rank; In files: stats.py:120; */ "Pioneer" = "Pioneer"; -/* stats.py: CQC rank; In files: stats.py:106; */ +/* stats.py: Mercenary rank; In files: stats.py:124; */ +"Defenceless" = "Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:125; */ +"Mostly Defenceless" = "Mostly Defenceless"; + +/* stats.py: Mercenary rank; In files: stats.py:126; */ +"Rookie" = "Rookie"; + +/* stats.py: Mercenary rank; In files: stats.py:127; */ +"Soldier" = "Soldier"; + +/* stats.py: Mercenary rank; In files: stats.py:128; stats.py:130; */ +"Gunslinger" = "Gunslinger"; + +/* stats.py: Mercenary rank; In files: stats.py:129; */ +"Warrior" = "Warrior"; + +/* stats.py: Mercenary rank; In files: stats.py:131; */ +"Deadeye" = "Deadeye"; + +/* stats.py: Exobiologist rank; In files: stats.py:134; */ +"Directionless" = "Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:135; */ +"Mostly Directionless" = "Mostly Directionless"; + +/* stats.py: Exobiologist rank; In files: stats.py:136; */ +"Compiler" = "Compiler"; + +/* stats.py: Exobiologist rank; In files: stats.py:137; */ +"Collector" = "Collector"; + +/* stats.py: Exobiologist rank; In files: stats.py:138; */ +"Cataloguer" = "Cataloguer"; + +/* stats.py: Exobiologist rank; In files: stats.py:139; */ +"Taxonomist" = "Taxonomist"; + +/* stats.py: Exobiologist rank; In files: stats.py:140; */ +"Ecologist" = "Ecologist"; + +/* stats.py: Exobiologist rank; In files: stats.py:141; */ +"Geneticist" = "Geneticist"; + +/* stats.py: CQC rank; In files: stats.py:144; */ "Helpless" = "Helpless"; -/* stats.py: CQC rank; In files: stats.py:107; */ +/* stats.py: CQC rank; In files: stats.py:145; */ "Mostly Helpless" = "Mostly Helpless"; -/* stats.py: CQC rank; In files: stats.py:108; */ +/* stats.py: CQC rank; In files: stats.py:146; */ "Amateur" = "Amateur"; -/* stats.py: CQC rank; In files: stats.py:109; */ +/* stats.py: CQC rank; In files: stats.py:147; */ "Semi Professional" = "Semi Professional"; -/* stats.py: CQC rank; In files: stats.py:110; */ +/* stats.py: CQC rank; In files: stats.py:148; */ "Professional" = "Professional"; -/* stats.py: CQC rank; In files: stats.py:111; */ +/* stats.py: CQC rank; In files: stats.py:149; */ "Champion" = "Champion"; -/* stats.py: CQC rank; In files: stats.py:112; */ +/* stats.py: CQC rank; In files: stats.py:150; */ "Hero" = "Hero"; -/* stats.py: CQC rank; In files: stats.py:113; */ +/* stats.py: CQC rank; In files: stats.py:151; */ "Gladiator" = "Gladiator"; -/* stats.py: Federation rank; In files: stats.py:120; */ +/* stats.py: Federation rank; In files: stats.py:157; */ "Recruit" = "Recruit"; -/* stats.py: Federation rank; In files: stats.py:121; */ +/* stats.py: Federation rank; In files: stats.py:158; */ "Cadet" = "Cadet"; -/* stats.py: Federation rank; In files: stats.py:122; */ +/* stats.py: Federation rank; In files: stats.py:159; */ "Midshipman" = "Midshipman"; -/* stats.py: Federation rank; In files: stats.py:123; */ +/* stats.py: Federation rank; In files: stats.py:160; */ "Petty Officer" = "Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:124; */ +/* stats.py: Federation rank; In files: stats.py:161; */ "Chief Petty Officer" = "Chief Petty Officer"; -/* stats.py: Federation rank; In files: stats.py:125; */ +/* stats.py: Federation rank; In files: stats.py:162; */ "Warrant Officer" = "Warrant Officer"; -/* stats.py: Federation rank; In files: stats.py:126; */ +/* stats.py: Federation rank; In files: stats.py:163; */ "Ensign" = "Ensign"; -/* stats.py: Federation rank; In files: stats.py:127; */ +/* stats.py: Federation rank; In files: stats.py:164; */ "Lieutenant" = "Lieutenant"; -/* stats.py: Federation rank; In files: stats.py:128; */ +/* stats.py: Federation rank; In files: stats.py:165; */ "Lieutenant Commander" = "Lieutenant Commander"; -/* stats.py: Federation rank; In files: stats.py:129; */ +/* stats.py: Federation rank; In files: stats.py:166; */ "Post Commander" = "Post Commander"; -/* stats.py: Federation rank; In files: stats.py:130; */ +/* stats.py: Federation rank; In files: stats.py:167; */ "Post Captain" = "Post Captain"; -/* stats.py: Federation rank; In files: stats.py:131; */ +/* stats.py: Federation rank; In files: stats.py:168; */ "Rear Admiral" = "Rear Admiral"; -/* stats.py: Federation rank; In files: stats.py:132; */ +/* stats.py: Federation rank; In files: stats.py:169; */ "Vice Admiral" = "Vice Admiral"; -/* stats.py: Federation rank; In files: stats.py:133; */ +/* stats.py: Federation rank; In files: stats.py:170; */ "Admiral" = "Admiral"; -/* stats.py: Empire rank; In files: stats.py:139; */ +/* stats.py: Empire rank; In files: stats.py:176; */ "Outsider" = "Outsider"; -/* stats.py: Empire rank; In files: stats.py:140; */ +/* stats.py: Empire rank; In files: stats.py:177; */ "Serf" = "Serf"; -/* stats.py: Empire rank; In files: stats.py:142; */ +/* stats.py: Empire rank; In files: stats.py:179; */ "Squire" = "Squire"; -/* stats.py: Empire rank; In files: stats.py:143; */ +/* stats.py: Empire rank; In files: stats.py:180; */ "Knight" = "Knight"; -/* stats.py: Empire rank; In files: stats.py:144; */ +/* stats.py: Empire rank; In files: stats.py:181; */ "Lord" = "Lord"; -/* stats.py: Empire rank; In files: stats.py:145; */ +/* stats.py: Empire rank; In files: stats.py:182; */ "Baron" = "Baron"; -/* stats.py: Empire rank; In files: stats.py:146; */ +/* stats.py: Empire rank; In files: stats.py:183; */ "Viscount" = "Viscount"; -/* stats.py: Empire rank; In files: stats.py:147; */ +/* stats.py: Empire rank; In files: stats.py:184; */ "Count" = "Count"; -/* stats.py: Empire rank; In files: stats.py:148; */ +/* stats.py: Empire rank; In files: stats.py:185; */ "Earl" = "Earl"; -/* stats.py: Empire rank; In files: stats.py:149; */ +/* stats.py: Empire rank; In files: stats.py:186; */ "Marquis" = "Marquis"; -/* stats.py: Empire rank; In files: stats.py:150; */ +/* stats.py: Empire rank; In files: stats.py:187; */ "Duke" = "Duke"; -/* stats.py: Empire rank; In files: stats.py:151; */ +/* stats.py: Empire rank; In files: stats.py:188; */ "Prince" = "Prince"; -/* stats.py: Empire rank; In files: stats.py:152; */ +/* stats.py: Empire rank; In files: stats.py:189; */ "King" = "King"; -/* stats.py: Power rank; In files: stats.py:158; */ +/* stats.py: Power rank; In files: stats.py:195; */ "Rating 1" = "Rating 1"; -/* stats.py: Power rank; In files: stats.py:159; */ +/* stats.py: Power rank; In files: stats.py:196; */ "Rating 2" = "Rating 2"; -/* stats.py: Power rank; In files: stats.py:160; */ +/* stats.py: Power rank; In files: stats.py:197; */ "Rating 3" = "Rating 3"; -/* stats.py: Power rank; In files: stats.py:161; */ +/* stats.py: Power rank; In files: stats.py:198; */ "Rating 4" = "Rating 4"; -/* stats.py: Power rank; In files: stats.py:162; */ +/* stats.py: Power rank; In files: stats.py:199; */ "Rating 5" = "Rating 5"; -/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:371; */ +/* stats.py: Current commander unknown when trying to use 'File' > 'Status'; In files: stats.py:317; */ +"Status: Don't yet know your Commander name" = "状态:暂时未知你的指挥官名称"; + +/* stats.py: No Frontier CAPI data yet when trying to use 'File' > 'Status'; In files: stats.py:325; */ +"Status: No CAPI data yet" = "状态:暂无 CAPI 数据"; + +/* stats.py: Status dialog subtitle - CR value of ship; In files: stats.py:413; */ "Value" = "价值"; -/* stats.py: Status dialog title; In files: stats.py:380; */ +/* stats.py: Status dialog title; In files: stats.py:422; */ "Ships" = "所有飞船"; From 44ecfb12cba7b3d18e036e31ea9f3d0344b7d1aa Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 6 Jun 2022 14:25:45 +0100 Subject: [PATCH 519/527] requirements-dev: Pin setuptools to 60.10.0 for now --- requirements-dev.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1261f113..fb670ef0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,9 @@ wheel # We can't rely on just picking this up from either the base (not venv), # or venv-init-time version. Specify here so that dependabot will prod us # about new versions. -setuptools==62.3.2 +## Anything later than 60.10.0 complains about auto-discovering multiple +## packages. ref: +setuptools==60.10.0 # Static analysis tools flake8==4.0.1 From 1567566524e97d57b6f668655a8ec9dd229e3498 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 17:04:37 +0000 Subject: [PATCH 520/527] build(deps-dev): bump mypy from 0.960 to 0.961 Bumps [mypy](https://github.com/python/mypy) from 0.960 to 0.961. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.960...v0.961) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1261f113..eaaec8eb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,7 +20,7 @@ flake8-noqa==1.2.2 flake8-polyfill==1.0.2 flake8-use-fstring==1.3 -mypy==0.960 +mypy==0.961 pep8-naming==0.13.0 safety==1.10.3 types-requests==2.27.30 From 20c60a3bb17b559746e575b4963dbb128b47a19b Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 8 Jun 2022 14:00:21 +0100 Subject: [PATCH 521/527] Release 5.4.0: appversion & Changelog Unchanged from 5.4.0-beta0 other than version change and thanking translators in Changelog.md. --- ChangeLog.md | 7 ++++++- config/__init__.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 1d480798..6e39b8ec 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,7 +27,7 @@ produce the Windows executables and installer. --- -Pre-Release 5.4.0-beta0 +Release 5.4.0 === * We now test against, and package with, Python 3.10.4. @@ -35,6 +35,9 @@ Pre-Release 5.4.0-beta0 * Odyssey Update 12 will add `BodyID` to `CodexEntry` journal events, so don't overwrite this with an augmentation if it is already present. We've also added the same for `BodyName` in case Frontier ever add that. +* [Translations](https://github.com/EDCD/EDMarketConnector/issues/24) updated. + Thanks again to all the contributors. + Bug Fixes --- * Cross-check the `MarketID` in CAPI data, not only the station name, to ensure @@ -58,6 +61,8 @@ This now uses specific exit codes in all cases, rather than a generic `EXIT_SYS_ERR` (6) for some cases. See the appropriate line in EDMC.py for details. +--- + Release 5.3.4 === diff --git a/config/__init__.py b/config/__init__.py index becde1af..6d26ce73 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.4.0-beta0' +_static_appversion = '5.4.0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From c70cb00eadf12c9f1ce8975c0f86dd0cfe75e8af Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 8 Jun 2022 14:19:28 +0100 Subject: [PATCH 522/527] Revert "develop: Bump appversion in anticipation of 5.4.0 release" This reverts commit c8fb9b1c4b170527e6618ef4dbdd1d15ffe88ff1. --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 924151ef..408d50ea 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.4.1-alpha0' +_static_appversion = '5.3.5-beta0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From ec69b9c7364870ee2886d3d7c1d6d8e2c8e85b49 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 8 Jun 2022 14:20:12 +0100 Subject: [PATCH 523/527] develop: post-release version bump to 5.4.1-alpha0 --- config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/__init__.py b/config/__init__.py index 6d26ce73..924151ef 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.4.0' +_static_appversion = '5.4.1-alpha0' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' From 16dfd63f78e6f964126accf9c936d9addb1560e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 17:03:09 +0000 Subject: [PATCH 524/527] build(deps): bump actions/setup-python from 3 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/push-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 166672b7..62ca8b45 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -53,7 +53,7 @@ jobs: # Get Python set up #################################################################### - name: Set up Python 3.10 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index be4fc9da..86556e49 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python 3.10 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index c38591cd..4140d956 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -20,7 +20,7 @@ jobs: with: submodules: true - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.10.4" architecture: "x86" From d20c2737d59495858045600c174795895662df75 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 8 Jun 2022 18:15:56 +0100 Subject: [PATCH 525/527] python: Utilis setup-python's new `python-version-file` This way we only need to edit `.python-version` and all the GitHub actions will automatically use that version. --- .github/workflows/pr-checks.yml | 4 ++-- .github/workflows/push-checks.yml | 4 ++-- .github/workflows/windows-build.yml | 2 +- docs/Releasing.md | 10 ++++------ 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 62ca8b45..55ee97ff 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -52,10 +52,10 @@ jobs: #################################################################### # Get Python set up #################################################################### - - name: Set up Python 3.10 + - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version-file: '.python-version' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 86556e49..298bd4ff 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -20,10 +20,10 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up Python 3.10 + - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version-file: '.python-version' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 4140d956..122ffd6d 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: "3.10.4" + python-version-file: '.python-version' architecture: "x86" - name: Install python tools diff --git a/docs/Releasing.md b/docs/Releasing.md index 2756f2fe..f691ee69 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -433,13 +433,13 @@ If you are making a pre-release then: When changing the Python version (Major.Minor.Patch) used: -1. Change the contents of `.python-version` so that pyenv notices. +1. Change the contents of `.python-version` so that pyenv notices. All of + the GitHub workflows now reference this via the `setup-python` + `python-version-file` directive. 1. Any version change: - 1. `.github/workflows/windows-build.yml` needs updating to have the GitHub - based build use the correct version. - 2. `ChangeLog.md` - The `We now test against, and package with, Python + 1. `ChangeLog.md` - The `We now test against, and package with, Python M.m.P.` line. 1. Major or Minor level changes: @@ -449,5 +449,3 @@ When changing the Python version (Major.Minor.Patch) used: pythonXX.dll file. 3. `.pre-commit-config.yaml` will need the `default_language_version` section updated to the appropriate version. - 4. All `.github/workflows/` files will need to be citing the correct - version in any `uses: actions/setup-python` section. From fd016723fccf6c105a74519ef3bcea693104c5a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 17:04:36 +0000 Subject: [PATCH 526/527] build(deps): bump requests from 2.27.1 to 2.28.0 Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.28.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.28.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fe63dbfe..05af8719 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ certifi==2022.5.18.1 -requests==2.27.1 +requests==2.28.0 watchdog==2.1.8 # Commented out because this doesn't package well with py2exe infi.systray==0.1.12; sys_platform == 'win32' From 8cbae3ccdd26b15f7fbdce88c92a8cc90f893425 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 17:02:36 +0000 Subject: [PATCH 527/527] build(deps): bump watchdog from 2.1.8 to 2.1.9 Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.8 to 2.1.9. - [Release notes](https://github.com/gorakhargosh/watchdog/releases) - [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst) - [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.1.8...v2.1.9) --- updated-dependencies: - dependency-name: watchdog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 05af8719..1ad9094f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ certifi==2022.5.18.1 requests==2.28.0 -watchdog==2.1.8 +watchdog==2.1.9 # Commented out because this doesn't package well with py2exe infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep