From c9b3e94e291c05bde429101eb916ce3a94f61998 Mon Sep 17 00:00:00 2001 From: sailoog Date: Thu, 21 Apr 2022 21:14:46 +0200 Subject: [PATCH 01/12] version 3.0.0 beta --- README.md | 8 ++++++-- debian/changelog | 6 ++++++ debian/control | 2 +- debian/copyright | 4 ++-- openplotterMaiana/maianaPostInstall.py | 5 +++-- openplotterMaiana/maianaPreUninstall.py | 5 +++-- openplotterMaiana/openplotterMaiana.py | 7 +++++-- openplotterMaiana/openplotterMaianaRead.py | 5 +++-- openplotterMaiana/service.py | 2 ++ openplotterMaiana/startup.py | 8 ++++++-- openplotterMaiana/version.py | 6 +++--- setup.py | 4 ++-- 12 files changed, 42 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index c99c3cb..8519cac 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Install MAIANA AIS transponder from openplotter-settings app. Install openplotter-maiana dependencies: -`sudo apt install ` +`sudo apt install openplotter-signalk-installer python3-serial` Clone the repository: @@ -34,11 +34,15 @@ cd .. sudo dpkg -i openplotter-maiana_x.x.x-xxx_all.deb ``` +Run post-installation script: + +`sudo maianaPostInstall` + Run: `openplotter-maiana` -Make your changes and repeat package and installation to test. Pull request your changes to github and we will check and add them to the next version of the [Debian package](https://launchpad.net/~openplotter/+archive/ubuntu/openplotter). +Pull request your changes to github and we will check and add them to the next version of the [Debian package](https://cloudsmith.io/~openplotter/repos/openplotter/packages/). ### Documentation diff --git a/debian/changelog b/debian/changelog index 2dfff75..a5931c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openplotter-maiana (3.0.0-beta) bullseye; urgency=medium + + * Beta + + -- Sailoog Thu, 21 Apr 2022 20:50:36 +0200 + openplotter-maiana (2.1.2-stable) bionic; urgency=medium * stable version diff --git a/debian/control b/debian/control index dfb0e7c..f29d173 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,6 @@ X-Python3-Version: >= 3.2 Package: openplotter-maiana Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings (>=2.8.0), openplotter-signalk-installer (>=2.4.2), python3-serial +Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings (>=3.2.1), openplotter-signalk-installer (>=2.4.2), python3-serial Description: OpenPlotter integration of the MAIANA open source AIS transponder OpenPlotter integration of the MAIANA open source AIS transponder diff --git a/debian/copyright b/debian/copyright index 45ff8f3..fa313b3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: openplotter-maiana Source: https://github.com/openplotter/openplotter-maiana Files: * -Copyright: 2021 Sailoog +Copyright: 2022 Sailoog License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ License: GPL-2+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". Files: debian/* -Copyright: 2021 Sailoog +Copyright: 2022 Sailoog License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openplotterMaiana/maianaPostInstall.py b/openplotterMaiana/maianaPostInstall.py index 6d58aee..99730e0 100755 --- a/openplotterMaiana/maianaPostInstall.py +++ b/openplotterMaiana/maianaPostInstall.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# This file is part of Openplotter. -# Copyright (C) 2021 by Sailoog +# This file is part of OpenPlotter. +# Copyright (C) 2022 by Sailoog # # Openplotter is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,6 +36,7 @@ def main(): else: print(_('DONE')) except Exception as e: print(_('FAILED: ')+str(e)) + #TODO switch from service to startup print(_('Adding openplotter-maiana-read service...')) try: fo = open('/etc/systemd/system/openplotter-maiana-read.service', "w") diff --git a/openplotterMaiana/maianaPreUninstall.py b/openplotterMaiana/maianaPreUninstall.py index 079ae1a..3d2167d 100755 --- a/openplotterMaiana/maianaPreUninstall.py +++ b/openplotterMaiana/maianaPreUninstall.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# This file is part of Openplotter. -# Copyright (C) 2021 by Sailoog +# This file is part of OpenPlotter. +# Copyright (C) 2022 by Sailoog # # Openplotter is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ def main(): package = 'openplotter-maiana' language.Language(currentdir, package, currentLanguage) + #TODO switch from service to startup print(_('Removing openplotter-maiana-read service...')) try: subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read']) diff --git a/openplotterMaiana/openplotterMaiana.py b/openplotterMaiana/openplotterMaiana.py index 2ea0126..17003b3 100644 --- a/openplotterMaiana/openplotterMaiana.py +++ b/openplotterMaiana/openplotterMaiana.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# This file is part of Openplotter. -# Copyright (C) 2021 by Sailoog +# This file is part of OpenPlotter. +# Copyright (C) 2022 by Sailoog # # Openplotter is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,6 +15,9 @@ # You should have received a copy of the GNU General Public License # along with Openplotter. If not, see . +#TODO add tx action +#TODO parse bin file + import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re import wx.richtext as rt from openplotterSettings import conf diff --git a/openplotterMaiana/openplotterMaianaRead.py b/openplotterMaiana/openplotterMaianaRead.py index 6c61c2c..22500a4 100644 --- a/openplotterMaiana/openplotterMaianaRead.py +++ b/openplotterMaiana/openplotterMaianaRead.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# This file is part of Openplotter. -# Copyright (C) 2021 by Sailoog +# This file is part of OpenPlotter. +# Copyright (C) 2022 by Sailoog # # Openplotter is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,6 +37,7 @@ def main(): sock = False while True: try: + #TODO switch from service to startup sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) server_address = ('localhost', 10110) sock.connect(server_address) diff --git a/openplotterMaiana/service.py b/openplotterMaiana/service.py index 3b4ec80..9b5672a 100644 --- a/openplotterMaiana/service.py +++ b/openplotterMaiana/service.py @@ -17,6 +17,8 @@ import sys, subprocess +#TODO remove + if sys.argv[1]=='openplotter-maiana-read': if sys.argv[2]=='start': subprocess.call(['systemctl', 'enable', 'openplotter-maiana-read']) diff --git a/openplotterMaiana/startup.py b/openplotterMaiana/startup.py index 72a2e59..94ba06c 100644 --- a/openplotterMaiana/startup.py +++ b/openplotterMaiana/startup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# This file is part of Openplotter. -# Copyright (C) 2021 by Sailoog +# This file is part of OpenPlotter. +# Copyright (C) 2022 by Sailoog # # Openplotter is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,6 +27,8 @@ class Start(): self.initialMessage = '' + #TODO run read from here + def start(self): green = '' black = '' @@ -47,6 +49,8 @@ class Check(): black = '' red = '' + #TODO check localhost 10110 and "Suppress nmea0183 event" in sk connection + #device device = self.conf.get('MAIANA', 'device') if not device: diff --git a/openplotterMaiana/version.py b/openplotterMaiana/version.py index b6a248b..3e9aba2 100644 --- a/openplotterMaiana/version.py +++ b/openplotterMaiana/version.py @@ -1,3 +1,3 @@ -version = '2.1.2' -codeName = 'Open Arms' -state = 'stable' +version = '3.0.0' +codeName = 'STOPmaremortum' +state = 'beta' \ No newline at end of file diff --git a/setup.py b/setup.py index 1350eec..ed8c58d 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 -# This file is part of Openplotter. -# Copyright (C) 2021 by Sailoog +# This file is part of OpenPlotter. +# Copyright (C) 2022 by Sailoog # # Openplotter is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by From 1aaffe8fda69bcfad52b6d7198bdfbc6a50448d9 Mon Sep 17 00:00:00 2001 From: sailoog Date: Sun, 24 Apr 2022 14:21:51 +0200 Subject: [PATCH 02/12] make service openplotter managed --- openplotterMaiana/maianaPostInstall.py | 16 +++----- openplotterMaiana/maianaPreUninstall.py | 8 +--- openplotterMaiana/openplotterMaiana.py | 44 +++++++++++----------- openplotterMaiana/openplotterMaianaRead.py | 1 - openplotterMaiana/service.py | 31 --------------- openplotterMaiana/startup.py | 41 ++++++++++---------- 6 files changed, 51 insertions(+), 90 deletions(-) delete mode 100644 openplotterMaiana/service.py diff --git a/openplotterMaiana/maianaPostInstall.py b/openplotterMaiana/maianaPostInstall.py index 99730e0..7b34c8e 100755 --- a/openplotterMaiana/maianaPostInstall.py +++ b/openplotterMaiana/maianaPostInstall.py @@ -27,6 +27,12 @@ def main(): package = 'openplotter-maiana' language.Language(currentdir, package, currentLanguage) + print(_('Installing python packages...')) + try: + subprocess.call(['pip3', 'install', 'websocket-client', '-U']) + print(_('DONE')) + except Exception as e: print(_('FAILED: ')+str(e)) + print(_('Checking access to Signal K server...')) try: from openplotterSignalkInstaller import connections @@ -36,16 +42,6 @@ def main(): else: print(_('DONE')) except Exception as e: print(_('FAILED: ')+str(e)) - #TODO switch from service to startup - print(_('Adding openplotter-maiana-read service...')) - try: - fo = open('/etc/systemd/system/openplotter-maiana-read.service', "w") - fo.write( '[Service]\nExecStart=openplotter-maiana-read\nStandardOutput=syslog\nStandardError=syslog\nUser='+conf2.user+'\nRestart=always\nRestartSec=5\n\n[Install]\nWantedBy=multi-user.target') - fo.close() - subprocess.call(['systemctl', 'daemon-reload']) - print(_('DONE')) - except Exception as e: print(_('FAILED: ')+str(e)) - print(_('Setting version...')) try: conf2.set('APPS', 'maiana', version) diff --git a/openplotterMaiana/maianaPreUninstall.py b/openplotterMaiana/maianaPreUninstall.py index 3d2167d..df288f2 100755 --- a/openplotterMaiana/maianaPreUninstall.py +++ b/openplotterMaiana/maianaPreUninstall.py @@ -26,13 +26,9 @@ def main(): package = 'openplotter-maiana' language.Language(currentdir, package, currentLanguage) - #TODO switch from service to startup - print(_('Removing openplotter-maiana-read service...')) + print(_('Stopping OpenPlotter MAIANA service...')) try: - subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read']) - subprocess.call(['systemctl', 'stop', 'openplotter-maiana-read']) - subprocess.call(['rm', '-f', '/etc/systemd/system/openplotter-maiana-read.service']) - subprocess.call(['systemctl', 'daemon-reload']) + subprocess.call(['pkill','-f','openplotter-maiana-read']) print(_('DONE')) except Exception as e: print(_('FAILED: ')+str(e)) diff --git a/openplotterMaiana/openplotterMaiana.py b/openplotterMaiana/openplotterMaiana.py index 17003b3..fffaf97 100644 --- a/openplotterMaiana/openplotterMaiana.py +++ b/openplotterMaiana/openplotterMaiana.py @@ -18,7 +18,7 @@ #TODO add tx action #TODO parse bin file -import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re +import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re, sys import wx.richtext as rt from openplotterSettings import conf from openplotterSettings import language @@ -137,6 +137,11 @@ class MyFrame(wx.Frame): url = self.platform.http+'localhost:'+self.platform.skPort+'/admin/#/serverConfiguration/connections/-' webbrowser.open(url, new=2) + def restartRead(self): + subprocess.call(['pkill','-f','openplotter-maiana-read']) + subprocess.Popen('openplotter-maiana-read') + time.sleep(1) + def onRead(self): self.ShowStatusBarYELLOW(_('Reading MAIANA device settings...')) self.mmsi.SetValue('') @@ -217,6 +222,15 @@ class MyFrame(wx.Frame): self.SKconn.SetValue(self.connInit) self.ShowStatusBarRED(_('Select the Signal K connection for the MAIANA device')) + if deviceOld != self.device: + if self.device: self.restartRead() + else: subprocess.call(['pkill','-f','openplotter-maiana-read']) + else: + if self.device: + test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding) + if not 'openplotter-maiana-read' in test: self.restartRead() + else: subprocess.call(['pkill','-f','openplotter-maiana-read']) + if self.device: ser = serial.Serial(self.device, 38400) ser.write('sys?\r\n'.encode("utf-8")) @@ -235,6 +249,7 @@ class MyFrame(wx.Frame): ts2 = time.mktime(datetime.datetime.strptime(timestamp, "%Y-%m-%dT%H:%M:%S.%fZ").timetuple()) if ts - ts2 > 3: self.ShowStatusBarRED(_('Cannot connect with the device, try again')) + print('#############################') return hardwareRevision = data['hardwareRevision']['value'] hardwareRevision = hardwareRevision.split('.') @@ -391,17 +406,6 @@ class MyFrame(wx.Frame): if 'bowOffset' in data['station']: self.bowOffset.SetValue(str(data['station']['bowOffset']['value'])) if 'portOffset' in data['station']: self.portOffset.SetValue(str(data['station']['portOffset']['value'])) - if deviceOld != self.device: - if self.device: - subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart']) - else: - subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'stop']) - else: - if self.device: - try: - subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding) - except: - subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart']) def onSKconn(self, event): deviceOld = self.conf.get('MAIANA', 'device') @@ -426,18 +430,14 @@ class MyFrame(wx.Frame): self.conf.set('MAIANA', 'device', self.device) except: pass if deviceOld != self.device: - if self.device: - subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart']) - time.sleep(1) - else: - subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'stop']) + if self.device: self.restartRead() + else: subprocess.call(['pkill','-f','openplotter-maiana-read']) else: if self.device: - try: - subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding) - except: - subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart']) - time.sleep(1) + test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding) + if not 'openplotter-maiana-read' in test: self.restartRead() + else: subprocess.call(['pkill','-f','openplotter-maiana-read']) + self.onRead() def pageSettings(self): diff --git a/openplotterMaiana/openplotterMaianaRead.py b/openplotterMaiana/openplotterMaianaRead.py index 22500a4..47a6000 100644 --- a/openplotterMaiana/openplotterMaianaRead.py +++ b/openplotterMaiana/openplotterMaianaRead.py @@ -37,7 +37,6 @@ def main(): sock = False while True: try: - #TODO switch from service to startup sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) server_address = ('localhost', 10110) sock.connect(server_address) diff --git a/openplotterMaiana/service.py b/openplotterMaiana/service.py deleted file mode 100644 index 9b5672a..0000000 --- a/openplotterMaiana/service.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 - -# This file is part of Openplotter. -# Copyright (C) 2021 by Sailoog -# -# Openplotter is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# any later version. -# Openplotter is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Openplotter. If not, see . - -import sys, subprocess - -#TODO remove - -if sys.argv[1]=='openplotter-maiana-read': - if sys.argv[2]=='start': - subprocess.call(['systemctl', 'enable', 'openplotter-maiana-read']) - subprocess.call(['systemctl', 'start', 'openplotter-maiana-read']) - if sys.argv[2]=='stop': - subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read']) - subprocess.call(['systemctl', 'stop', 'openplotter-maiana-read']) - if sys.argv[2]=='restart': - subprocess.call(['systemctl', 'enable', 'openplotter-maiana-read']) - subprocess.call(['systemctl', 'restart', 'openplotter-maiana-read']) \ No newline at end of file diff --git a/openplotterMaiana/startup.py b/openplotterMaiana/startup.py index 94ba06c..bbf4618 100644 --- a/openplotterMaiana/startup.py +++ b/openplotterMaiana/startup.py @@ -25,15 +25,17 @@ class Start(): currentdir = os.path.dirname(os.path.abspath(__file__)) language.Language(currentdir,'openplotter-maiana',currentLanguage) - self.initialMessage = '' - - #TODO run read from here + self.initialMessage = _('Starting MAIANA transponder...') def start(self): green = '' black = '' red = '' + subprocess.call(['pkill', '-f', 'openplotter-maiana-read']) + subprocess.Popen('openplotter-maiana-read') + time.sleep(1) + return {'green': green,'black': black,'red': red} class Check(): @@ -73,27 +75,26 @@ class Check(): if not green: green = msg else: green+= ' | '+msg - #service + # check service + test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding) if device and (result[0] == 'approved' or result[0] == 'validated'): - try: - subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding) - msg = _('OpenPlotter MAIANA service is running') + if 'openplotter-maiana-read' in test: + msg = _('running') if not green: green = msg else: green+= ' | '+msg - except: - msg = _('OpenPlotter MAIANA service is not running') - if not red: red = msg - else: red+= '\n '+msg + else: + msg = _('not running') + if red: red += '\n '+msg + else: red = msg else: - try: - subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding) - msg = _('OpenPlotter MAIANA service is running') - if not red: red = msg - else: red+= '\n '+msg - except: - msg = _('OpenPlotter MAIANA service is not running') - if not green: green = msg - else: green+= ' | '+msg + if 'openplotter-maiana-read' in test: + msg = _('running') + if red: red += '\n '+msg + else: red = msg + else: + msg = _('not running') + if not black: black = msg + else: black+= ' | '+msg return {'green': green,'black': black,'red': red} From 549a462afae805d97084358eda06d8c8a9484ada Mon Sep 17 00:00:00 2001 From: sailoog Date: Sun, 24 Apr 2022 15:24:01 +0200 Subject: [PATCH 03/12] check device and SK server settings --- openplotterMaiana/openplotterMaiana.py | 6 ++- openplotterMaiana/startup.py | 51 ++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/openplotterMaiana/openplotterMaiana.py b/openplotterMaiana/openplotterMaiana.py index fffaf97..9d059f7 100644 --- a/openplotterMaiana/openplotterMaiana.py +++ b/openplotterMaiana/openplotterMaiana.py @@ -199,6 +199,7 @@ class MyFrame(wx.Frame): device = '' baudrate = '' connectionType = '' + suppress0183event = False try: enabled = i['enabled'] skID = i['id'] @@ -207,7 +208,8 @@ class MyFrame(wx.Frame): device = dataSubOptions['device'] baudrate = dataSubOptions['baudrate'] connectionType = dataSubOptions['type'] - if enabled and connectionType == 'serial' and baudrate == 38400 and dataType == 'NMEA0183': + if 'suppress0183event' in dataSubOptions: suppress0183event = dataSubOptions['suppress0183event'] + if enabled and connectionType == 'serial' and baudrate == 38400 and dataType == 'NMEA0183' and not suppress0183event: availableIDs.append(skID) if device == self.device: selected = skID except: pass @@ -437,7 +439,7 @@ class MyFrame(wx.Frame): test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding) if not 'openplotter-maiana-read' in test: self.restartRead() else: subprocess.call(['pkill','-f','openplotter-maiana-read']) - + self.onRead() def pageSettings(self): diff --git a/openplotterMaiana/startup.py b/openplotterMaiana/startup.py index bbf4618..0ccdf3a 100644 --- a/openplotterMaiana/startup.py +++ b/openplotterMaiana/startup.py @@ -15,8 +15,9 @@ # You should have received a copy of the GNU General Public License # along with Openplotter. If not, see . -import time, os, subprocess, sys +import time, os, subprocess, sys, ujson from openplotterSettings import language +from openplotterSettings import platform from openplotterSignalkInstaller import connections class Start(): @@ -41,6 +42,7 @@ class Start(): class Check(): def __init__(self, conf, currentLanguage): self.conf = conf + self.platform = platform.Platform() currentdir = os.path.dirname(os.path.abspath(__file__)) language.Language(currentdir,'openplotter-maiana',currentLanguage) @@ -50,8 +52,6 @@ class Check(): green = '' black = '' red = '' - - #TODO check localhost 10110 and "Suppress nmea0183 event" in sk connection #device device = self.conf.get('MAIANA', 'device') @@ -64,6 +64,51 @@ class Check(): if not green: green = msg else: green+= ' | '+msg + #check devie¡ce and server settings + if device: + settingsOK = False + nmeaOK = True + try: + setting_file = self.platform.skDir+'/settings.json' + with open(setting_file) as data_file: + data = ujson.load(data_file) + except: data = {} + if 'pipedProviders' in data: data2 = data['pipedProviders'] + else: data2 = [] + for i in data2: + enabled = '' + dataType = '' + baudrate = '' + connectionType = '' + suppress0183event = False + try: + dataSubOptions = i['pipeElements'][0]['options']['subOptions'] + if device in dataSubOptions['device']: + enabled = i['enabled'] + dataType = i['pipeElements'][0]['options']['type'] + baudrate = dataSubOptions['baudrate'] + connectionType = dataSubOptions['type'] + if 'suppress0183event' in dataSubOptions: suppress0183event = dataSubOptions['suppress0183event'] + if enabled and connectionType == 'serial' and baudrate == 38400 and dataType == 'NMEA0183' and not suppress0183event: settingsOK = True + except: pass + if settingsOK: + msg = _('device settings OK') + if not green: green = msg + else: green+= ' | '+msg + else: + msg = _('check device settings') + if not red: red = msg + else: red+= '\n '+msg + + if 'interfaces' in data: data2 = data['interfaces'] + else: data2 = [] + if 'nmea-tcp' in data2: + if not data2['nmea-tcp']: nmeaOK = False + if not nmeaOK: + msg = _('NMEA 0183 over TCP (10110) interface is disabled. Check Signal K server settings') + if not red: red = msg + else: red+= '\n '+msg + #access skConnections = connections.Connections('MAIANA') result = skConnections.checkConnection() From b532c5b5aa7f3b30e537de187e6d160046d6dc88 Mon Sep 17 00:00:00 2001 From: sailoog Date: Sun, 24 Apr 2022 20:28:59 +0200 Subject: [PATCH 04/12] add actions --- openplotterMaiana/actions.py | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 openplotterMaiana/actions.py diff --git a/openplotterMaiana/actions.py b/openplotterMaiana/actions.py new file mode 100644 index 0000000..073430e --- /dev/null +++ b/openplotterMaiana/actions.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 + +# This file is part of OpenPlotter. +# Copyright (C) 2022 by Sailoog +# +# Openplotter is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# any later version. +# Openplotter is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Openplotter. If not, see . + +import os, subprocess, serial +from openplotterSettings import language + +class Actions: + def __init__(self,conf,currentLanguage): + self.conf = conf + currentdir = os.path.dirname(os.path.abspath(__file__)) + language.Language(currentdir,'openplotter-maiana',currentLanguage) + if self.conf.get('GENERAL', 'debug') == 'yes': self.debug = True + else: self.debug = False + self.available = [] + self.available.append({'ID':'txOn','name':_('Turn MAIANA TX on'),"module": "openplotterMaiana",'data':False,'default':'','help':''}) + self.available.append({'ID':'txOff','name':_('Turn MAIANA TX off'),"module": "openplotterMaiana",'data':False,'default':'','help':''}) + + def run(self,action,data): + try: + device = self.conf.get('MAIANA', 'device') + ser = serial.Serial(device, 38400) + if action == 'txOn': ser.write('tx on\r\n'.encode("utf-8")) + elif action == 'txOff': ser.write('tx off\r\n'.encode("utf-8")) + except Exception as e: + if self.debug: print('Error processing openplotter-maiana actions: '+str(e)) From 30eaa1d54046b34b0f741dee602fa64caaa03c19 Mon Sep 17 00:00:00 2001 From: sailoog Date: Mon, 25 Apr 2022 22:08:00 +0200 Subject: [PATCH 05/12] parse firmware files --- openplotterMaiana/data/download.png | Bin 0 -> 974 bytes openplotterMaiana/openplotterMaiana.py | 41 +++++++++++++++++++++---- 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 openplotterMaiana/data/download.png diff --git a/openplotterMaiana/data/download.png b/openplotterMaiana/data/download.png new file mode 100644 index 0000000000000000000000000000000000000000..ce8903515c38a8e364c58d508ae165b2480932bd GIT binary patch literal 974 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;Y9?C1WI$O_~uBzpw; zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZk1_nl#0G|+7ke=no<(3_n zUw%w>=~1a=XH=G)kXv>Pf@GH-XIQmLVg7!3kjPPn|NrHHikBaiS$aZ#*-`nWK#fq9 zK!(DqQy}irV{#x9KnBV!Jq%@KSNuPba_?xN{PM#P z+3xLg|DQ|&qNhj7X%3KzC<*clW>APP zi4fsi`1gA=GslS~jP)U^y+P0Re)}l#X}VTepwd1$l~+?%{kVGOO`1!AThit`md8)2 zFaKkI|DlNF^NsDjqBGy6U%&U^$JM*d-Tb$OWDXorFwMy|XYBM-@&?+$nB?v5!qCAg z>jC6&7I;J!GcfQS0b$0e+I-SLLG}_)Usv|WoYMS8@_RM%Zvll~db&7he%1si08oBS(q?qww@8 zT@I|5j08Aua+E0Ou?tNP?>I0eFeM=%sP6z%h=fGQ#iLiQT(wj-k&rM6Y@NDwOKC~T z*DsP1Dgj4$d3u!=FH-LHm5}h6c=YTUT_xq@BxPmYwGwM`C#dASRZG5$uaC{o z;K3WF$px<5$>uX!tY@{jr^M9wWko)T2#l@(RB#C%pue}0NvT3FSRR{1KH z-|Q}GOWoPn5nC}Q!>*kack&yTeJqKK@wy`aDG}zd16s2 kLwR|*US?i)adKios$PCk`s{Z$Qb0uvp00i_>zopr05A!nK>z>% literal 0 HcmV?d00001 diff --git a/openplotterMaiana/openplotterMaiana.py b/openplotterMaiana/openplotterMaiana.py index 9d059f7..b7bbe7c 100644 --- a/openplotterMaiana/openplotterMaiana.py +++ b/openplotterMaiana/openplotterMaiana.py @@ -15,9 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Openplotter. If not, see . -#TODO add tx action -#TODO parse bin file - import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re, sys import wx.richtext as rt from openplotterSettings import conf @@ -287,13 +284,18 @@ class MyFrame(wx.Frame): self.logger.BeginFontSize(10) self.logger.WriteText(_('Hardware revision')) - if 'hardwareRevision' in data: self.logger.WriteText(': '+data['hardwareRevision']['value']) + if 'hardwareRevision' in data: + self.logger.WriteText(': '+data['hardwareRevision']['value']) + self.hardwareRevision = data['hardwareRevision']['value'] self.logger.Newline() self.logger.WriteText(_('Firmware revision')) - if 'firmwareRevision' in data: self.logger.WriteText(': '+data['firmwareRevision']['value']) + if 'firmwareRevision' in data: + self.logger.WriteText(': '+data['firmwareRevision']['value']) self.logger.Newline() self.logger.WriteText(_('Type of MCU')) - if 'MCUtype' in data: self.logger.WriteText(': '+data['MCUtype']['value']) + if 'MCUtype' in data: + self.logger.WriteText(': '+data['MCUtype']['value']) + self.MCUtype = data['MCUtype']['value'] self.logger.Newline() self.logger.WriteText(_('Serial number')) if 'serialNumber' in data: self.logger.WriteText(': '+data['serialNumber']['value']) @@ -585,6 +587,10 @@ class MyFrame(wx.Frame): toolRefresh = self.toolbar2.AddTool(201, _('Refresh'), wx.Bitmap(self.currentdir+"/data/refresh.png")) self.Bind(wx.EVT_TOOL, self.OnToolRefresh, toolRefresh) self.toolbar2.AddSeparator() + + toolDownload= self.toolbar2.AddTool(203, _('Download firmware'), wx.Bitmap(self.currentdir+"/data/download.png")) + self.Bind(wx.EVT_TOOL, self.OnToolDownload, toolDownload) + toolFile= self.toolbar2.AddTool(202, _('Update firmware'), wx.Bitmap(self.currentdir+"/data/file.png")) self.Bind(wx.EVT_TOOL, self.OnToolFile, toolFile) self.logger = rt.RichTextCtrl(self.firmware, style=wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_DONTWRAP|wx.LC_SORT_ASCENDING) @@ -596,6 +602,10 @@ class MyFrame(wx.Frame): self.firmware.SetSizer(vbox) + def OnToolDownload(self,e): + url = "https://github.com/peterantypas/maiana/tree/master/latest/Firmware/Transponder/Binaries" + webbrowser.open(url, new=2) + def OnToolFile(self,e): file_path = False dlg = wx.FileDialog(self, message=_('Choose a file'), defaultDir='~', defaultFile='', wildcard=_('bin files') + ' (*.bin)|*.bin|' + _('All files') + ' (*.*)|*.*', style=wx.FD_OPEN | wx.FD_CHANGE_DIR) @@ -603,6 +613,25 @@ class MyFrame(wx.Frame): file_path = dlg.GetPath() dlg.Destroy() if file_path: + try: + fileName = file_path.split('/') + fileName = fileName[-1] + fileName = fileName.split('-') + MCUtype = fileName[1].upper() + if MCUtype != self.MCUtype: + self.ShowStatusBarRED(_('MCU type mismatch: ')+MCUtype) + return + hardwareRevision = fileName[2].replace('hw','') + hardwareRevision2 = self.hardwareRevision.split('.') + del hardwareRevision2[-1] + hardwareRevision2 = '.'.join(hardwareRevision2) + if hardwareRevision != hardwareRevision2: + self.ShowStatusBarRED(_('Hardware revision mismatch: ')+hardwareRevision) + return + except Exception as e: + self.ShowStatusBarRED(_('Error processing file: ')+str(e)) + return + self.SetStatusText('') dlg = wx.MessageDialog(None, _( 'Your MAIANA device firmware will be updated, please do not disconnect or tamper with it during the update.\n\nDo you want to go ahead?'), _('Question'), wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION) From 7d39efc6a7a0ba180c06d36af887b008a0fd4ea1 Mon Sep 17 00:00:00 2001 From: sailoog Date: Tue, 26 Apr 2022 19:43:21 +0200 Subject: [PATCH 06/12] version 3.1.0 beta --- debian/changelog | 2 +- openplotterMaiana/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a5931c6..a3d9aa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openplotter-maiana (3.0.0-beta) bullseye; urgency=medium +openplotter-maiana (3.1.0-beta) bullseye; urgency=medium * Beta diff --git a/openplotterMaiana/version.py b/openplotterMaiana/version.py index 3e9aba2..17d64e5 100644 --- a/openplotterMaiana/version.py +++ b/openplotterMaiana/version.py @@ -1,3 +1,3 @@ -version = '3.0.0' +version = '3.1.0' codeName = 'STOPmaremortum' state = 'beta' \ No newline at end of file From 1cb2ec3e0e36f8d6b663f1921f989d312bec1e1e Mon Sep 17 00:00:00 2001 From: sailoog Date: Sat, 21 May 2022 21:08:44 +0200 Subject: [PATCH 07/12] fix startup --- openplotterMaiana/startup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openplotterMaiana/startup.py b/openplotterMaiana/startup.py index 0ccdf3a..80a6b4f 100644 --- a/openplotterMaiana/startup.py +++ b/openplotterMaiana/startup.py @@ -61,8 +61,8 @@ class Check(): else: red+= '\n '+msg else: msg = _('MAIANA device')+': '+device - if not green: green = msg - else: green+= ' | '+msg + if not black: black = msg + else: black+= ' | '+msg #check devie¡ce and server settings if device: @@ -93,8 +93,8 @@ class Check(): except: pass if settingsOK: msg = _('device settings OK') - if not green: green = msg - else: green+= ' | '+msg + if not black: black = msg + else: black+= ' | '+msg else: msg = _('check device settings') if not red: red = msg @@ -117,8 +117,8 @@ class Check(): else: red+= '\n '+result[1] if result[0] == 'approved' or result[0] == 'validated': msg = _('Access to Signal K server validated') - if not green: green = msg - else: green+= ' | '+msg + if not black: black = msg + else: black+= ' | '+msg # check service test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding) From 7488f8ffae2169c883d9a17fb461b69ce1be6cc3 Mon Sep 17 00:00:00 2001 From: sailoog Date: Sat, 21 May 2022 21:09:57 +0200 Subject: [PATCH 08/12] update language source --- .../en/LC_MESSAGES/openplotter-maiana.mo | Bin 424 -> 424 bytes .../en/LC_MESSAGES/openplotter-maiana.po | 386 ++++++++++-------- 2 files changed, 214 insertions(+), 172 deletions(-) diff --git a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.mo index 69a6f9ab7b6e46e87ffc6ec1dc7c5b038b61360f..530e325df2833b020a34b9dd624b9272a6b5ae21 100644 GIT binary patch delta 27 icmZ3%yn=Z`seqBLfvK*Mp@Na2m4T(UfzifRWkvvHUk1$p delta 27 icmZ3%yn=Z`seqxbp^>hkfr6p2m5H&of#JqhWkvvH1_s6e diff --git a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po index 85d972a..d67056e 100644 --- a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: openplotter-maiana\n" -"POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:43+0100\n" +"POT-Creation-Date: 2022-05-21 21:09+0200\n" +"PO-Revision-Date: 2022-05-21 21:09+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" @@ -15,6 +15,14 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: .\n" +#: actions.py:29 +msgid "Turn MAIANA TX on" +msgstr "" + +#: actions.py:30 +msgid "Turn MAIANA TX off" +msgstr "" + #: data/openplotter-maiana.desktop:3 msgid "MAIANA AIS" msgstr "" @@ -63,33 +71,33 @@ msgstr "" msgid "Starting transfer" msgstr "" -#: fwupdate.py:136 maianaPostInstall.py:37 maianaPostInstall.py:46 -#: maianaPostInstall.py:52 maianaPreUninstall.py:36 maianaPreUninstall.py:42 +#: fwupdate.py:136 maianaPostInstall.py:34 maianaPostInstall.py:43 +#: maianaPostInstall.py:49 maianaPreUninstall.py:33 maianaPreUninstall.py:39 msgid "FAILED: " msgstr "" #: maianaPostInstall.py:30 -msgid "Checking access to Signal K server..." +msgid "Installing python packages..." msgstr "" -#: maianaPostInstall.py:36 maianaPostInstall.py:45 maianaPostInstall.py:51 -#: maianaPreUninstall.py:35 maianaPreUninstall.py:41 +#: maianaPostInstall.py:33 maianaPostInstall.py:42 maianaPostInstall.py:48 +#: maianaPreUninstall.py:32 maianaPreUninstall.py:38 msgid "DONE" msgstr "" -#: maianaPostInstall.py:39 -msgid "Adding openplotter-maiana-read service..." +#: maianaPostInstall.py:36 +msgid "Checking access to Signal K server..." msgstr "" -#: maianaPostInstall.py:48 +#: maianaPostInstall.py:45 msgid "Setting version..." msgstr "" #: maianaPreUninstall.py:29 -msgid "Removing openplotter-maiana-read service..." +msgid "Stopping OpenPlotter MAIANA service..." msgstr "" -#: maianaPreUninstall.py:38 +#: maianaPreUninstall.py:35 msgid "Removing version..." msgstr "" @@ -125,231 +133,247 @@ msgstr "" msgid "Firmware" msgstr "" -#: openplotterMaiana.py:138 +#: openplotterMaiana.py:143 msgid "Reading MAIANA device settings..." msgstr "" -#: openplotterMaiana.py:195 -msgid "Select the Signal K connection for the MAIANA device" -msgstr "" - -#: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244 -msgid "Cannot connect with the device, try again" -msgstr "" - -#: openplotterMaiana.py:219 openplotterMaiana.py:222 -msgid "The hardware version of your MAIANA device is too old" -msgstr "" - -#: openplotterMaiana.py:227 openplotterMaiana.py:230 openplotterMaiana.py:233 -msgid "The firmware version of your MAIANA device is too old" -msgstr "" - -#: openplotterMaiana.py:246 -msgid "Done" -msgstr "" - -#: openplotterMaiana.py:249 -msgid "Hardware revision" -msgstr "" - -#: openplotterMaiana.py:252 -msgid "Firmware revision" -msgstr "" - -#: openplotterMaiana.py:255 -msgid "Type of MCU" -msgstr "" - -#: openplotterMaiana.py:258 -msgid "Serial number" -msgstr "" - -#: openplotterMaiana.py:263 -msgid "Transmitter hardware module" -msgstr "" - -#: openplotterMaiana.py:268 -msgid "present" -msgstr "" - -#: openplotterMaiana.py:271 -msgid "not present" -msgstr "" - -#: openplotterMaiana.py:274 -msgid "Hardware TX switch" -msgstr "" - -#: openplotterMaiana.py:279 openplotterMaiana.py:291 -msgid "ON" -msgstr "" - -#: openplotterMaiana.py:282 openplotterMaiana.py:296 -msgid "OFF" -msgstr "" - -#: openplotterMaiana.py:285 openplotterMaiana.py:461 -msgid "Software TX switch" -msgstr "" - -#: openplotterMaiana.py:300 -msgid "Station data" -msgstr "" - -#: openplotterMaiana.py:305 -msgid "provided" -msgstr "" - -#: openplotterMaiana.py:308 -msgid "not provided" -msgstr "" - -#: openplotterMaiana.py:311 -msgid "Status" -msgstr "" - -#: openplotterMaiana.py:316 -msgid "transmitting" -msgstr "" - -#: openplotterMaiana.py:319 -msgid "not transmitting" -msgstr "" - -#: openplotterMaiana.py:322 -msgid "Channel A latest transmitted message" -msgstr "" - -#: openplotterMaiana.py:328 openplotterMaiana.py:341 -msgid "Type" -msgstr "" - -#: openplotterMaiana.py:332 openplotterMaiana.py:344 -msgid "Time" -msgstr "" - -#: openplotterMaiana.py:335 -msgid "Channel B latest transmitted message" -msgstr "" - -#: openplotterMaiana.py:347 -msgid "Channel A noise floor" -msgstr "" - -#: openplotterMaiana.py:352 -msgid "Channel B noise floor" -msgstr "" - -#: openplotterMaiana.py:376 +#: openplotterMaiana.py:170 msgid " Press \"Approve\" and then \"Refresh\"." msgstr "" -#: openplotterMaiana.py:380 +#: openplotterMaiana.py:176 msgid " Press \"Refresh\"." msgstr "" -#: openplotterMaiana.py:382 +#: openplotterMaiana.py:179 msgid " Press \"Allowed\"." msgstr "" -#: openplotterMaiana.py:439 -msgid "MMSI" +#: openplotterMaiana.py:222 +msgid "Select the Signal K connection for the MAIANA device" msgstr "" -#: openplotterMaiana.py:441 -msgid "Vessel name" +#: openplotterMaiana.py:250 openplotterMaiana.py:278 openplotterMaiana.py:281 +msgid "Cannot connect with the device, try again" msgstr "" -#: openplotterMaiana.py:443 -msgid "Call sign" +#: openplotterMaiana.py:256 openplotterMaiana.py:259 +msgid "The hardware version of your MAIANA device is too old" msgstr "" -#: openplotterMaiana.py:445 -msgid "Vessel type" +#: openplotterMaiana.py:264 openplotterMaiana.py:267 openplotterMaiana.py:270 +msgid "The firmware version of your MAIANA device is too old" msgstr "" -#: openplotterMaiana.py:447 -msgid "LOA" +#: openplotterMaiana.py:283 +msgid "Done" msgstr "" -#: openplotterMaiana.py:449 -msgid "Beam" +#: openplotterMaiana.py:286 +msgid "Hardware revision" +msgstr "" + +#: openplotterMaiana.py:291 +msgid "Firmware revision" +msgstr "" + +#: openplotterMaiana.py:295 +msgid "Type of MCU" +msgstr "" + +#: openplotterMaiana.py:300 +msgid "Serial number" +msgstr "" + +#: openplotterMaiana.py:305 +msgid "Transmitter hardware module" +msgstr "" + +#: openplotterMaiana.py:310 +msgid "present" +msgstr "" + +#: openplotterMaiana.py:313 +msgid "not present" +msgstr "" + +#: openplotterMaiana.py:316 +msgid "Hardware TX switch" +msgstr "" + +#: openplotterMaiana.py:321 openplotterMaiana.py:333 +msgid "ON" +msgstr "" + +#: openplotterMaiana.py:324 openplotterMaiana.py:338 +msgid "OFF" +msgstr "" + +#: openplotterMaiana.py:327 openplotterMaiana.py:473 +msgid "Software TX switch" +msgstr "" + +#: openplotterMaiana.py:342 +msgid "Station data" +msgstr "" + +#: openplotterMaiana.py:347 +msgid "provided" +msgstr "" + +#: openplotterMaiana.py:350 +msgid "not provided" +msgstr "" + +#: openplotterMaiana.py:353 +msgid "Status" +msgstr "" + +#: openplotterMaiana.py:358 +msgid "transmitting" +msgstr "" + +#: openplotterMaiana.py:361 +msgid "not transmitting" +msgstr "" + +#: openplotterMaiana.py:364 +msgid "Channel A latest transmitted message" +msgstr "" + +#: openplotterMaiana.py:370 openplotterMaiana.py:383 +msgid "Type" +msgstr "" + +#: openplotterMaiana.py:374 openplotterMaiana.py:386 +msgid "Time" +msgstr "" + +#: openplotterMaiana.py:377 +msgid "Channel B latest transmitted message" +msgstr "" + +#: openplotterMaiana.py:389 +msgid "Channel A noise floor" +msgstr "" + +#: openplotterMaiana.py:394 +msgid "Channel B noise floor" msgstr "" #: openplotterMaiana.py:451 -msgid "Port Offset" +msgid "MMSI" msgstr "" #: openplotterMaiana.py:453 -msgid "Bow Offset" +msgid "Vessel name" msgstr "" #: openplotterMaiana.py:455 -msgid "Units: meters" +msgid "Call sign" msgstr "" -#: openplotterMaiana.py:458 openplotterMaiana.py:575 -msgid "Refresh" +#: openplotterMaiana.py:457 +msgid "Vessel type" msgstr "" -#: openplotterMaiana.py:464 -msgid "Detect noise" +#: openplotterMaiana.py:459 +msgid "LOA" +msgstr "" + +#: openplotterMaiana.py:461 +msgid "Beam" +msgstr "" + +#: openplotterMaiana.py:463 +msgid "Port Offset" +msgstr "" + +#: openplotterMaiana.py:465 +msgid "Bow Offset" msgstr "" #: openplotterMaiana.py:467 +msgid "Units: meters" +msgstr "" + +#: openplotterMaiana.py:470 openplotterMaiana.py:587 +msgid "Refresh" +msgstr "" + +#: openplotterMaiana.py:476 +msgid "Detect noise" +msgstr "" + +#: openplotterMaiana.py:479 msgid "Save station data" msgstr "" -#: openplotterMaiana.py:514 +#: openplotterMaiana.py:526 msgid "Invalid MMSI" msgstr "" -#: openplotterMaiana.py:520 +#: openplotterMaiana.py:532 msgid "Invalid vessel name" msgstr "" -#: openplotterMaiana.py:525 +#: openplotterMaiana.py:537 msgid "Invalid call sign" msgstr "" -#: openplotterMaiana.py:534 +#: openplotterMaiana.py:546 msgid "Invalid vessel type" msgstr "" -#: openplotterMaiana.py:539 +#: openplotterMaiana.py:551 msgid "Invalid LOA" msgstr "" -#: openplotterMaiana.py:544 +#: openplotterMaiana.py:556 msgid "Invalid Beam" msgstr "" -#: openplotterMaiana.py:549 +#: openplotterMaiana.py:561 msgid "Invalid bow offset" msgstr "" -#: openplotterMaiana.py:554 +#: openplotterMaiana.py:566 msgid "Invalid port offset" msgstr "" -#: openplotterMaiana.py:578 +#: openplotterMaiana.py:591 +msgid "Download firmware" +msgstr "" + +#: openplotterMaiana.py:594 msgid "Update firmware" msgstr "" -#: openplotterMaiana.py:591 +#: openplotterMaiana.py:611 msgid "Choose a file" msgstr "" -#: openplotterMaiana.py:591 +#: openplotterMaiana.py:611 msgid "bin files" msgstr "" -#: openplotterMaiana.py:591 +#: openplotterMaiana.py:611 msgid "All files" msgstr "" -#: openplotterMaiana.py:597 +#: openplotterMaiana.py:622 +msgid "MCU type mismatch: " +msgstr "" + +#: openplotterMaiana.py:629 +msgid "Hardware revision mismatch: " +msgstr "" + +#: openplotterMaiana.py:632 +msgid "Error processing file: " +msgstr "" + +#: openplotterMaiana.py:636 msgid "" "Your MAIANA device firmware will be updated, please do not disconnect or " "tamper with it during the update.\n" @@ -357,19 +381,19 @@ msgid "" "Do you want to go ahead?" msgstr "" -#: openplotterMaiana.py:598 +#: openplotterMaiana.py:637 msgid "Question" msgstr "" -#: openplotterMaiana.py:601 +#: openplotterMaiana.py:640 msgid "Stopping Signal K server" msgstr "" -#: openplotterMaiana.py:608 +#: openplotterMaiana.py:647 msgid "Updating firmware, please wait... " msgstr "" -#: openplotterMaiana.py:610 +#: openplotterMaiana.py:649 msgid "Starting Signal K server" msgstr "" @@ -377,26 +401,44 @@ msgstr "" msgid "There may be electromagnetic interference near the MAIANA AIS antenna" msgstr "" -#: startup.py:43 +#: startup.py:29 +msgid "Starting MAIANA transponder..." +msgstr "" + +#: startup.py:49 msgid "Checking MAIANA transponder..." msgstr "" -#: startup.py:53 +#: startup.py:59 msgid "There is no MAIANA device defined" msgstr "" -#: startup.py:57 +#: startup.py:63 msgid "MAIANA device" msgstr "" -#: startup.py:68 +#: startup.py:95 +msgid "device settings OK" +msgstr "" + +#: startup.py:99 +msgid "check device settings" +msgstr "" + +#: startup.py:108 +msgid "" +"NMEA 0183 over TCP (10110) interface is disabled. Check Signal K server " +"settings" +msgstr "" + +#: startup.py:119 msgid "Access to Signal K server validated" msgstr "" -#: startup.py:76 startup.py:86 -msgid "OpenPlotter MAIANA service is running" +#: startup.py:127 startup.py:136 +msgid "running" msgstr "" -#: startup.py:80 startup.py:90 -msgid "OpenPlotter MAIANA service is not running" +#: startup.py:131 startup.py:140 +msgid "not running" msgstr "" From 312db6af3ab2b5ba9e793c27c23496a15b2472d4 Mon Sep 17 00:00:00 2001 From: sailoog Date: Sat, 21 May 2022 21:31:12 +0200 Subject: [PATCH 09/12] version 3.1.2 beta --- debian/changelog | 2 +- openplotterMaiana/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3d9aa3..bcfa0cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openplotter-maiana (3.1.0-beta) bullseye; urgency=medium +openplotter-maiana (3.1.2-beta) bullseye; urgency=medium * Beta diff --git a/openplotterMaiana/version.py b/openplotterMaiana/version.py index 17d64e5..a8f39f2 100644 --- a/openplotterMaiana/version.py +++ b/openplotterMaiana/version.py @@ -1,3 +1,3 @@ -version = '3.1.0' +version = '3.1.2' codeName = 'STOPmaremortum' state = 'beta' \ No newline at end of file From 7d4d2b0e5e921e85e11eddadddabe7e11649a07f Mon Sep 17 00:00:00 2001 From: sailoog Date: Wed, 1 Jun 2022 21:44:41 +0200 Subject: [PATCH 10/12] version 3.1.3 beta --- debian/changelog | 2 +- .../ca/LC_MESSAGES/openplotter-maiana.mo | Bin 7099 -> 7099 bytes .../ca/LC_MESSAGES/openplotter-maiana.po | 2 +- .../cs/LC_MESSAGES/openplotter-maiana.mo | Bin 3327 -> 6981 bytes .../cs/LC_MESSAGES/openplotter-maiana.po | 126 ++++++------ .../da/LC_MESSAGES/openplotter-maiana.mo | Bin 4212 -> 4212 bytes .../da/LC_MESSAGES/openplotter-maiana.po | 2 +- .../de/LC_MESSAGES/openplotter-maiana.mo | Bin 7019 -> 7019 bytes .../de/LC_MESSAGES/openplotter-maiana.po | 2 +- .../el/LC_MESSAGES/openplotter-maiana.mo | Bin 565 -> 565 bytes .../el/LC_MESSAGES/openplotter-maiana.po | 2 +- .../en/LC_MESSAGES/openplotter-maiana.mo | Bin 424 -> 424 bytes .../en/LC_MESSAGES/openplotter-maiana.po | 2 +- .../es/LC_MESSAGES/openplotter-maiana.mo | Bin 7176 -> 7176 bytes .../es/LC_MESSAGES/openplotter-maiana.po | 2 +- .../fi/LC_MESSAGES/openplotter-maiana.mo | Bin 6927 -> 6927 bytes .../fi/LC_MESSAGES/openplotter-maiana.po | 2 +- .../fr/LC_MESSAGES/openplotter-maiana.mo | Bin 7336 -> 7336 bytes .../fr/LC_MESSAGES/openplotter-maiana.po | 2 +- .../it/LC_MESSAGES/openplotter-maiana.mo | Bin 567 -> 567 bytes .../it/LC_MESSAGES/openplotter-maiana.po | 2 +- .../nb/LC_MESSAGES/openplotter-maiana.mo | Bin 579 -> 4259 bytes .../nb/LC_MESSAGES/openplotter-maiana.po | 118 +++++------ .../nl/LC_MESSAGES/openplotter-maiana.mo | Bin 565 -> 565 bytes .../nl/LC_MESSAGES/openplotter-maiana.po | 2 +- .../pl/LC_MESSAGES/openplotter-maiana.mo | Bin 7148 -> 7291 bytes .../pl/LC_MESSAGES/openplotter-maiana.po | 8 +- .../sv/LC_MESSAGES/openplotter-maiana.mo | Bin 570 -> 6902 bytes .../sv/LC_MESSAGES/openplotter-maiana.po | 193 +++++++++--------- openplotterMaiana/openplotterMaiana.py | 2 +- openplotterMaiana/version.py | 2 +- 31 files changed, 237 insertions(+), 234 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcfa0cb..f4550c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openplotter-maiana (3.1.2-beta) bullseye; urgency=medium +openplotter-maiana (3.1.3-beta) bullseye; urgency=medium * Beta diff --git a/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.mo index 9ab898cf083040a3f31148016265dcf473f9cccd..c866ba50a6421a526103b5c04c47d55cd3e921be 100644 GIT binary patch delta 29 kcmdmOzT135pn!mpu7R1ZfuVwtp_Q?rwt>;+M1d%70DhhakN^Mx delta 29 kcmdmOzT135pn!m(uAz~xp@D*-v6YF5wt?a1M1d%70DgZ5kN^Mx diff --git a/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po index 334c3ae..10e522f 100644 --- a/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:44+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Catalan\n" "Language: ca\n" diff --git a/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.mo index 7b443c0fab9120e5b79f7a37e03941d2e724654a..7443d3990e12615a9c0e18256446d1c7ead5d3d8 100644 GIT binary patch literal 6981 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 diff --git a/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.po index 5174db9..1c86528 100644 --- a/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:44+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Czech\n" "Language: cs\n" @@ -92,7 +92,7 @@ msgstr "Nastavuji verzi..." #: maianaPreUninstall.py:29 msgid "Removing openplotter-maiana-read service..." -msgstr "" +msgstr "Odstraňuji službu openplotter-maiana-read..." #: maianaPreUninstall.py:38 msgid "Removing version..." @@ -104,39 +104,39 @@ msgstr "MAIANA AIS vysílač" #: openplotterMaiana.py:47 msgid "Help" -msgstr "" +msgstr "Nápověda" #: openplotterMaiana.py:50 openplotterMaiana.py:69 msgid "Settings" -msgstr "" +msgstr "Nastavení" #: openplotterMaiana.py:53 msgid "Approve" -msgstr "" +msgstr "Schválit" #: openplotterMaiana.py:55 msgid "Allowed" -msgstr "" +msgstr "Povoleno" #: openplotterMaiana.py:58 msgid "MAIANA Signal K connection" -msgstr "" +msgstr "MAIANA připojení k Signal K" #: openplotterMaiana.py:62 msgid "Connections" -msgstr "" +msgstr "Připojení" #: openplotterMaiana.py:70 msgid "Firmware" -msgstr "" +msgstr "Firmware" #: openplotterMaiana.py:138 msgid "Reading MAIANA device settings..." -msgstr "" +msgstr "Čtení nastavení MAIANA zařízení..." #: openplotterMaiana.py:195 msgid "Select the Signal K connection for the MAIANA device" -msgstr "" +msgstr "Vyberte připojení Signal K pro zařízení MAIANA" #: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244 msgid "Cannot connect with the device, try again" @@ -152,151 +152,151 @@ msgstr "Verze firmwaru vašeho zařízení MAIANA je příliš stará" #: openplotterMaiana.py:246 msgid "Done" -msgstr "" +msgstr "Hotovo" #: openplotterMaiana.py:249 msgid "Hardware revision" -msgstr "" +msgstr "Verze hardware" #: openplotterMaiana.py:252 msgid "Firmware revision" -msgstr "" +msgstr "Verze firmware" #: openplotterMaiana.py:255 msgid "Type of MCU" -msgstr "" +msgstr "Typ MCU" #: openplotterMaiana.py:258 msgid "Serial number" -msgstr "" +msgstr "Sériové číslo" #: openplotterMaiana.py:263 msgid "Transmitter hardware module" -msgstr "" +msgstr "Hardwarový modul vysílače" #: openplotterMaiana.py:268 msgid "present" -msgstr "" +msgstr "přítomný" #: openplotterMaiana.py:271 msgid "not present" -msgstr "" +msgstr "není k dispozici" #: openplotterMaiana.py:274 msgid "Hardware TX switch" -msgstr "" +msgstr "Hardwarový přepínač TX" #: openplotterMaiana.py:279 openplotterMaiana.py:291 msgid "ON" -msgstr "" +msgstr "ZAP" #: openplotterMaiana.py:282 openplotterMaiana.py:296 msgid "OFF" -msgstr "" +msgstr "VYP" #: openplotterMaiana.py:285 openplotterMaiana.py:461 msgid "Software TX switch" -msgstr "" +msgstr "Softwarový přepínač TX" #: openplotterMaiana.py:300 msgid "Station data" -msgstr "" +msgstr "Data stanice" #: openplotterMaiana.py:305 msgid "provided" -msgstr "" +msgstr "nastavena" #: openplotterMaiana.py:308 msgid "not provided" -msgstr "" +msgstr "nenastavena" #: openplotterMaiana.py:311 msgid "Status" -msgstr "" +msgstr "Stav" #: openplotterMaiana.py:316 msgid "transmitting" -msgstr "" +msgstr "vysílá" #: openplotterMaiana.py:319 msgid "not transmitting" -msgstr "" +msgstr "nevysílá" #: openplotterMaiana.py:322 msgid "Channel A latest transmitted message" -msgstr "" +msgstr "Nejnovější zpráva kanálu A" #: openplotterMaiana.py:328 openplotterMaiana.py:341 msgid "Type" -msgstr "" +msgstr "Typ" #: openplotterMaiana.py:332 openplotterMaiana.py:344 msgid "Time" -msgstr "" +msgstr "Čas" #: openplotterMaiana.py:335 msgid "Channel B latest transmitted message" -msgstr "" +msgstr "Nejnovější zpráva kanálu B" #: openplotterMaiana.py:347 msgid "Channel A noise floor" -msgstr "" +msgstr "Kanál A úroveň šumu" #: openplotterMaiana.py:352 msgid "Channel B noise floor" -msgstr "" +msgstr "Kanál B úroveň šumu" #: openplotterMaiana.py:376 msgid " Press \"Approve\" and then \"Refresh\"." -msgstr "" +msgstr " Stiskněte \"Schválit\" a pak \"Obnovit\"." #: openplotterMaiana.py:380 msgid " Press \"Refresh\"." -msgstr "" +msgstr " Stiskněte Aktualizovat." #: openplotterMaiana.py:382 msgid " Press \"Allowed\"." -msgstr "" +msgstr " Stiskněte \"Povoleno\"." #: openplotterMaiana.py:439 msgid "MMSI" -msgstr "" +msgstr "MMSI" #: openplotterMaiana.py:441 msgid "Vessel name" -msgstr "" +msgstr "Název plavidla" #: openplotterMaiana.py:443 msgid "Call sign" -msgstr "" +msgstr "Volací značka" #: openplotterMaiana.py:445 msgid "Vessel type" -msgstr "" +msgstr "Druh plavidla" #: openplotterMaiana.py:447 msgid "LOA" -msgstr "" +msgstr "LOA" #: openplotterMaiana.py:449 msgid "Beam" -msgstr "" +msgstr "Šířka" #: openplotterMaiana.py:451 msgid "Port Offset" -msgstr "" +msgstr "GPS offset zleva" #: openplotterMaiana.py:453 msgid "Bow Offset" -msgstr "" +msgstr "GPS offset zepředu" #: openplotterMaiana.py:455 msgid "Units: meters" -msgstr "" +msgstr "Jednotky: metry" #: openplotterMaiana.py:458 openplotterMaiana.py:575 msgid "Refresh" -msgstr "" +msgstr "Aktualizovat" #: openplotterMaiana.py:464 msgid "Detect noise" @@ -304,39 +304,39 @@ msgstr "Detekovat šum" #: openplotterMaiana.py:467 msgid "Save station data" -msgstr "" +msgstr "Uložit data stanice" #: openplotterMaiana.py:514 msgid "Invalid MMSI" -msgstr "" +msgstr "Neplatné MMSI" #: openplotterMaiana.py:520 msgid "Invalid vessel name" -msgstr "" +msgstr "Neplatné jméno plavidla" #: openplotterMaiana.py:525 msgid "Invalid call sign" -msgstr "" +msgstr "Neplatná volací značka" #: openplotterMaiana.py:534 msgid "Invalid vessel type" -msgstr "" +msgstr "Neplatný typ plavidla" #: openplotterMaiana.py:539 msgid "Invalid LOA" -msgstr "" +msgstr "Neplatné LOA" #: openplotterMaiana.py:544 msgid "Invalid Beam" -msgstr "" +msgstr "Neplatná šířka" #: openplotterMaiana.py:549 msgid "Invalid bow offset" -msgstr "" +msgstr "Neplatný GPS offset zepředu" #: openplotterMaiana.py:554 msgid "Invalid port offset" -msgstr "" +msgstr "Neplatný GPS offset zleva" #: openplotterMaiana.py:578 msgid "Update firmware" @@ -386,24 +386,24 @@ msgstr "V blízkosti antény AIS může docházet k elektromagnetickému rušen #: startup.py:43 msgid "Checking MAIANA transponder..." -msgstr "" +msgstr "Kontrola MAIANA odpovídače..." #: startup.py:53 msgid "There is no MAIANA device defined" -msgstr "" +msgstr "Není definováno žádné MAIANA zařízení" #: startup.py:57 msgid "MAIANA device" -msgstr "" +msgstr "MAIANA zařízení" #: startup.py:68 msgid "Access to Signal K server validated" -msgstr "" +msgstr "Přístup k serveru Signal K byl ověřen" #: startup.py:76 startup.py:86 msgid "OpenPlotter MAIANA service is running" -msgstr "" +msgstr "OpenPlotter MAIANA služba je spuštěna" #: startup.py:80 startup.py:90 msgid "OpenPlotter MAIANA service is not running" -msgstr "" +msgstr "Služba OpenPlotter MAIANA není spuštěna" diff --git a/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.mo index f504367ec2bd12793172edf86bf8d90a3867a2f0..0bbb5d1186cd731c16461768ffab9a341df8dd8a 100644 GIT binary patch delta 29 kcmeyO@I_&R0hfT0u7R1ZfuVwtp_Q?rwt>-R2QCvf0D-dyTL1t6 delta 29 kcmeyO@I_&R0hfTGuAz~xp@D*-v6YF5wt?Yh2QCvf0D+VTTL1t6 diff --git a/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po index 3955e45..0e482ba 100644 --- a/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:44+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Danish\n" "Language: da\n" diff --git a/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.mo index d57606a06d9d6db0246b05059bd46055485219e7..86a3c8fa6fa491c1035092cd3ddd7c24d6d543b7 100644 GIT binary patch delta 29 kcmaED_S$Sipn!mpu7R1ZfuVwtp_Q?rwt>;+L;)^t0EkEjo&W#< delta 29 kcmaED_S$Sipn!m(uAz~xp@D*-v6YF5wt?a1L;)^t0Ej6Eo&W#< diff --git a/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po index a76da80..f7b7f9b 100644 --- a/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:44+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de\n" diff --git a/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.mo index af0252640c047fbf067dee08bfbbfa26babcdf51..976e696aaf2db4bb56e17a3b58fbdfd06b466e6d 100644 GIT binary patch delta 27 icmdnWvXx~*o`8|Aftjv>p@Na2m9e3=fzigg?Ti3udhkfr6p2m5GVAf#Jrw?Ti3uT?c6Z diff --git a/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po index 28201a7..f59753f 100644 --- a/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:44+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Greek\n" "Language: el\n" diff --git a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.mo index 530e325df2833b020a34b9dd624b9272a6b5ae21..dc4d8b14076b701c0f941e56d15d7ebe593e42ae 100644 GIT binary patch delta 21 ccmZ3%yn=Z`1(%twfuVwtp_Q@0#wImJ07BjcrvLx| delta 21 ccmZ3%yn=Z`1(&I=k)eW-p_PH<#wImJ07C->t^fc4 diff --git a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po index d67056e..0e15c07 100644 --- a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter-maiana\n" "POT-Creation-Date: 2022-05-21 21:09+0200\n" -"PO-Revision-Date: 2022-05-21 21:09+0200\n" +"PO-Revision-Date: 2022-06-01 21:30+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" diff --git a/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.mo index 75a7d2abdf168ef09b2c3988c12aa4ea488f5c0d..4c86cbdf3c735a94953a4f7892b8644721a7191e 100644 GIT binary patch delta 29 kcmeCM=&;xjC?H^@Yhb2pV5neZXk~1uZD6!HQD8YY0CYwNc>n+a delta 29 kcmeCM=&;xjC?H^{YiOivXrN$dY-M7iZD6=LQD8YY0CXn@c>n+a diff --git a/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po index 719f280..d8afc43 100644 --- a/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:44+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es\n" diff --git a/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.mo index 5ace9d59bb0d39b10013a82e26c9e6e23f56d69a..8b48e81fd34852c6face97e4079a81956d86a7f4 100644 GIT binary patch delta 29 kcmeA->o?mFC?H^@Yhb2pV5neZXk~1uZD6!HQD7Yx0CjH%i2wiq delta 29 kcmeA->o?mFC?H^{YiOivXrN$dY-M7iZD6=LQD7Yx0Ci9Yi2wiq diff --git a/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po index bb0e898..6dd0e15 100644 --- a/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:44+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Finnish\n" "Language: fi\n" diff --git a/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.mo index 785aebaaf3105cb030b21ef29c6d321adfdde8f1..5c289d7a0d86e0199841427082208abf91dbd546 100644 GIT binary patch delta 29 kcmZ2sxx#Wopn!mpu7R1ZfuVwtp_Q?rwt>;+L;-gm0D8R#TmS$7 delta 29 kcmZ2sxx#Wopn!m(uAz~xp@D*-v6YFjwt?a1L;-gm0D6@NTL1t6 diff --git a/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po index a6e8697..3aa9992 100644 --- a/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:43+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr\n" diff --git a/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.mo index efa00932c23a477630819a0865915779007cbb90..fad6477dfcfb1dd26d1bfaf33560e7972ee9a961 100644 GIT binary patch delta 27 icmdnavYll@o`8|Aftjv>p@Na2m9e3=fziggos0lz=m&2A delta 27 icmdnavYll@o`9jQp^>hkfr6p2m5H&of#Jrwos0lz!3S;t diff --git a/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po index 5f8dbc6..dca1842 100644 --- a/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:43+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Italian\n" "Language: it\n" diff --git a/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.mo index 3b354c96c2fc2869eb1d0fee28d92a47e548207e..cce6230acc2ec6f08a477d1aa7f23119befc689f 100644 GIT binary patch literal 4259 zcmbW3OKc=Z8Gs8guxlW&$+Cpyk&443n|05Qy-RS$T4~3R*;rmbu)V7lLW1^mxu-on z)uZaRjTeavA_$NWB7h=+I3?o10i+yQL{9hsk#aynLBIjT2@XL52?;Kd`2K#(jGdLT zqUD;etGXWlvwr{i!Ljcto>|(5Y5#tUQfu&)xADVs>g`H>44#H(U=3b?*Wf$hZb?^; z-+?m!dH8<#a@qe&*&lm{QXgmhJp2&62Hyog2Q}=#G5Gb8--4&;KMTj<56k|Kp~&+y z_#pgM*?$$v`oBS${~A08{{zp%2M}6Ry8zz`J@_cB!;5eOJ_NrEufXrX_rPC6IpL-w`)QeE&y#!CA_{;DD{ok>P*ynXvgJ+o} z>*gUYQ_Jv^@H0^SdI-(V%l;pr$oCKU2t13?cvV;61Z+Z)J1E(OBA0^?z%P~k zZ$Q!GSt#c`4@JITK#}LSQ2hG)a{RAQ?DStK{(Okd#J}gD$a5Y}!X}jcEW8N60>yqm zg>v36AzP?dpv3K;p!ngRQ1lpkZz2B~I8FayDEYDs<-893AdI2-`57qseG@Lg??Um* zAEEgFH7I(W;&91_N1*7p2su(MLpk@eP~;4utWP1XQ_n#0)3>46<2gv`=3_uTDL*_S z;|FNsJ2_8mAbt=X#cne+@y}(N_)TOM`9udfUu-4kiftdK$=UL7T>eN5U7&~R9o@n;_F4;E|+P8tuI>zdW4YR|y&O~i6X*kjh zg2;wC=^NXRlPojN>-mvyea{&`(5Z3zQQOpNHPwvcmB%xkL8PY zm?>pz^|bE-`J}gQ>l7=tJHw&jBop`5N^_~X+SJXZ&5_r_nEk{C##O@uJxk}vF>9@s zT3b~ccvXy2?o~Jodt@1-saRyg^pbsPj5^iJaPZ^r~+ zk&Ez*-Ro_m#%3XoKDKKiq1sG#vJ>Xo%zP)}7pB;e4KhDN93A+XpLh0BwS_=CmG#S= zb+V%mlRbCB9K=ADBsz(Md{w9N(EYE9dPZ#xqTK1h7R1V4%(ugS@gowf%->Wut-npQ z5K-GEjO;*_NdhGm{c@w_5h{u84CytpNPLBM>^$5kA0vUqu>Hhkd@ACb?FV67jg>J! zS%zS4&5`K7DLL9u690V!GBzvU36+3LK|Tz!n#Jmk!K12$azEvZjxAVs$u4o@Ed}1K zBA6PZ5jeiS=53TI<1KKFH1u?RdfKZ$>D8z7^i<<={bGH(ULU{Vr z$kxz>aJRjAmmDCCSDN~`ec$leTjCCzo_T6!W`>=swUsf&SR=!7)g9ZftRl63a$;7# z?d1`jH;wPwoprSK>gYYL^p-p9cJ;*dB-R}(r2!jPF+6puzwRo7y|*UQ+LyvhsPRumH|nc_Tdi)8{M>UNFpCV4`#iLo7n|0fCk zqr3Y$3R$c+BbI9_t=l=e>v-*%IKNp%nl1&DddJmsboUTh(=O$2F!<&x=kB$V!Cix7 zxn?0jooiU#v7VIbqNXhqt}cmVOy+dbtK`?+T_ojpL}5{mxTLd8u``9nQUy#gTSsz5 zcye2%sWW9_4MTC~qnHIcMTjN*sx|pO?7uB`;pPl%5qor4Y+EYMi(2 z#3Ga#>K|XVzps0P3F_(H|Etn@IJ?wIHE*f)qpzwP__?~+z0!rLj;u|YTPQE(s!}%ClZRkl6e~mv@tXKji;ZMa4t)JWcLZ O+J>vD1(kpB^Zx*IS7hn{ delta 87 zcmZ3ic$mfFo)F7a1|VPrVi_P-0b*t#)&XJ=umECCCI$veAPrIj1Cvj1nh6-{8XD;u U8YmbVTbUSZ8yIfp<2uR+0Gz4{bpQYW diff --git a/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po index fec41d5..2e39490 100644 --- a/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:43+0100\n" +"PO-Revision-Date: 2022-06-01 21:30+0200\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -22,237 +22,237 @@ msgstr "" #: data/openplotter-maiana.desktop:3 msgid "MAIANA AIS" -msgstr "" +msgstr "MAIANA AIS" #: data/openplotter-maiana.desktop:5 msgid "openplotter-maiana" -msgstr "" +msgstr "openplotter-maiana" #: fwupdate.py:26 msgid "Checking if unit is running" -msgstr "" +msgstr "Kontrollerer om enheten kjører" #: fwupdate.py:42 msgid "Unit is running, switching to DFU mode" -msgstr "" +msgstr "Enheten kjører, bytter til DFU-modus" #: fwupdate.py:70 msgid "Usage:" -msgstr "" +msgstr "Bruk:" #: fwupdate.py:82 msgid "Unable to open serial port" -msgstr "" +msgstr "Kan ikke åpne seriell port" #: fwupdate.py:91 msgid "Unable to open file" -msgstr "" +msgstr "Kan ikke åpne fil" #: fwupdate.py:101 msgid "File size:" -msgstr "" +msgstr "Filstørrelse:" #: fwupdate.py:105 msgid "Could not get unit into DFU mode" -msgstr "" +msgstr "Kunne ikke sette enhet i DFU-modus" #: fwupdate.py:109 msgid "Unit is in DFU mode" -msgstr "" +msgstr "Enheten er i DFU-modus" #: fwupdate.py:113 msgid "Unable to begin transfer, restart the unit and retry" -msgstr "" +msgstr "Kan ikke starte overføringen, start enheten på nytt og prøv igjen" #: fwupdate.py:117 msgid "Starting transfer" -msgstr "" +msgstr "Starter overføring" #: fwupdate.py:136 maianaPostInstall.py:37 maianaPostInstall.py:46 #: maianaPostInstall.py:52 maianaPreUninstall.py:36 maianaPreUninstall.py:42 msgid "FAILED: " -msgstr "" +msgstr "FEILET: " #: maianaPostInstall.py:30 msgid "Checking access to Signal K server..." -msgstr "" +msgstr "Sjekker tilgang til Signal K-server..." #: maianaPostInstall.py:36 maianaPostInstall.py:45 maianaPostInstall.py:51 #: maianaPreUninstall.py:35 maianaPreUninstall.py:41 msgid "DONE" -msgstr "" +msgstr "FERDIG" #: maianaPostInstall.py:39 msgid "Adding openplotter-maiana-read service..." -msgstr "" +msgstr "Legger til openplotter-maiana-lese-tjeneste..." #: maianaPostInstall.py:48 msgid "Setting version..." -msgstr "" +msgstr "Angir versjon..." #: maianaPreUninstall.py:29 msgid "Removing openplotter-maiana-read service..." -msgstr "" +msgstr "Fjerner openplotter-maiana-lese-tjenesten..." #: maianaPreUninstall.py:38 msgid "Removing version..." -msgstr "" +msgstr "Fjerner versjonen..." #: openplotterMaiana.py:37 msgid "MAIANA AIS transponder" -msgstr "" +msgstr "MAIANA AIS transponder" #: openplotterMaiana.py:47 msgid "Help" -msgstr "" +msgstr "Hjelp" #: openplotterMaiana.py:50 openplotterMaiana.py:69 msgid "Settings" -msgstr "" +msgstr "Innstillinger" #: openplotterMaiana.py:53 msgid "Approve" -msgstr "" +msgstr "Godta" #: openplotterMaiana.py:55 msgid "Allowed" -msgstr "" +msgstr "Tillatt" #: openplotterMaiana.py:58 msgid "MAIANA Signal K connection" -msgstr "" +msgstr "MAIANA Signal K-tilkobling" #: openplotterMaiana.py:62 msgid "Connections" -msgstr "" +msgstr "Tilkoblinger" #: openplotterMaiana.py:70 msgid "Firmware" -msgstr "" +msgstr "Fastvare" #: openplotterMaiana.py:138 msgid "Reading MAIANA device settings..." -msgstr "" +msgstr "Leser MAIANA-enhetens innstillinger..." #: openplotterMaiana.py:195 msgid "Select the Signal K connection for the MAIANA device" -msgstr "" +msgstr "Velg Signal K-tilkobling til MAIANA-enheten" #: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244 msgid "Cannot connect with the device, try again" -msgstr "" +msgstr "Kan ikke koble til enheten, prøv igjen" #: openplotterMaiana.py:219 openplotterMaiana.py:222 msgid "The hardware version of your MAIANA device is too old" -msgstr "" +msgstr "MAIANA enheten er for gammel" #: openplotterMaiana.py:227 openplotterMaiana.py:230 openplotterMaiana.py:233 msgid "The firmware version of your MAIANA device is too old" -msgstr "" +msgstr "Fastvareversjonen på MAIANA-enheten er for gammel" #: openplotterMaiana.py:246 msgid "Done" -msgstr "" +msgstr "Ferdig" #: openplotterMaiana.py:249 msgid "Hardware revision" -msgstr "" +msgstr "Revisjon av maskinvare" #: openplotterMaiana.py:252 msgid "Firmware revision" -msgstr "" +msgstr "Fastvarerevisjon" #: openplotterMaiana.py:255 msgid "Type of MCU" -msgstr "" +msgstr "Type MCU" #: openplotterMaiana.py:258 msgid "Serial number" -msgstr "" +msgstr "Serienummer" #: openplotterMaiana.py:263 msgid "Transmitter hardware module" -msgstr "" +msgstr "Senderens maskinvaremodul" #: openplotterMaiana.py:268 msgid "present" -msgstr "" +msgstr "til stede" #: openplotterMaiana.py:271 msgid "not present" -msgstr "" +msgstr "ikke til stede" #: openplotterMaiana.py:274 msgid "Hardware TX switch" -msgstr "" +msgstr "Maskinvare TX-bryter" #: openplotterMaiana.py:279 openplotterMaiana.py:291 msgid "ON" -msgstr "" +msgstr "PÅ" #: openplotterMaiana.py:282 openplotterMaiana.py:296 msgid "OFF" -msgstr "" +msgstr "AV" #: openplotterMaiana.py:285 openplotterMaiana.py:461 msgid "Software TX switch" -msgstr "" +msgstr "Programvare TX-bryter" #: openplotterMaiana.py:300 msgid "Station data" -msgstr "" +msgstr "Stasjonsdata" #: openplotterMaiana.py:305 msgid "provided" -msgstr "" +msgstr "oppgitt" #: openplotterMaiana.py:308 msgid "not provided" -msgstr "" +msgstr "ikke oppgitt" #: openplotterMaiana.py:311 msgid "Status" -msgstr "" +msgstr "Status" #: openplotterMaiana.py:316 msgid "transmitting" -msgstr "" +msgstr "overfører" #: openplotterMaiana.py:319 msgid "not transmitting" -msgstr "" +msgstr "sender ikke" #: openplotterMaiana.py:322 msgid "Channel A latest transmitted message" -msgstr "" +msgstr "Siste overførte melding på kanal A" #: openplotterMaiana.py:328 openplotterMaiana.py:341 msgid "Type" -msgstr "" +msgstr "Type" #: openplotterMaiana.py:332 openplotterMaiana.py:344 msgid "Time" -msgstr "" +msgstr "Tid" #: openplotterMaiana.py:335 msgid "Channel B latest transmitted message" -msgstr "" +msgstr "Siste overførte melding på kanal B" #: openplotterMaiana.py:347 msgid "Channel A noise floor" -msgstr "" +msgstr "Støyterskel kanal A" #: openplotterMaiana.py:352 msgid "Channel B noise floor" -msgstr "" +msgstr "Støyterskel kanal B" #: openplotterMaiana.py:376 msgid " Press \"Approve\" and then \"Refresh\"." -msgstr "" +msgstr " Trykk \"Godkjenn\" og deretter \"Oppdater\"." #: openplotterMaiana.py:380 msgid " Press \"Refresh\"." -msgstr "" +msgstr " Trykk på \"Oppdater\"." #: openplotterMaiana.py:382 msgid " Press \"Allowed\"." diff --git a/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.mo index daa188ece94a7b0c36308e9a2bfb1f7c07e7e20f..60f476dce45f9b17fb7df75cbedcfc5f86e9c777 100644 GIT binary patch delta 27 icmdnWvXx~*o`8|Aftjv>p@Na2m9e3=fzigg?Ti3udhkfr6p2m5H&of#Jrw?Ti3uRR?GQ diff --git a/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po index b4ef38e..f75dbdc 100644 --- a/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:43+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Dutch\n" "Language: nl\n" diff --git a/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.mo index 57398579e7592fd31ecf267b8b314b435a615389..a0f279b6e5de011df01608d2cbd3061cf253780c 100644 GIT binary patch delta 2239 zcmYM#Sxi({9LMp)B8UjXRu`~z#03z>&J41+wu)P;R4J{BRE02OB}Py{3~Ico8Y3?h zgKK=z7hjP0FtOB_CS4K}n^YSD4-liq#5R$}@L+v$>-Tr(P*3K6KlgvR_w4ubPx-3~ z=V3Wi@@ptPW#*>fY6nuob z?-}x(V_tBgigUU80al{&TALrkT=KIx4s-i2XhWc%O3w8e;)bk^liDTAx)=VB^QcXT`$rRx< zEW>QtH&vWyBzsT|cAy?Og0bjeAs$D~z;)zj203U%4{g0^;eHdxS*cy!E8Kg^9wkiybr0%459}gV;+v9I+V#pRhVs^k0;54$o4P; z_WCcVf&77KIO<{kHR3TYXzJdgW+H*V>P8QCvj($pI(Z*A2k|#l{t^o?mEIR)IZ}lQ zp&D*St@$xj2fOeiJcs#N_4t|SFo^cLwq7k1$t@Zb)*Xydyf5J)R_fbnTj11b0qec+NR#r!+ zqdHiLe%y_!=K|`x5g!~-yh@)H1N7+WXs1CkH zeVAfcuONC+71y9TavH1f2I~GdsCr|mOascrMA|oboNT}a$j@|ePz7gD5B!LwID}fu zDO^;Cb5NVkk6OYVs6DV7^|rKOH-2aHG^SZ=o@@1?qYKM8(bQ}}ZJM2^k%m!Ic>rVZ z3qqUc8$x9>p@tR^JBjs#mZF4EQD-zWDpcW?)f`t6>!PXSjy!rE{VaY;vW!?YaS=6o zErrVBDDK*R#W|DWmN^_5s5`ZK18RwCLT{JKT;fZDRrtSTY5lj_bO){=HWEt-_Kmxf z>rq8tHkGdly(uc&qqzULHgT?Rfr^jNr&{Z;nPscEZ&3|?LM$ZK5&^BhrdaEmPkc^j z6KXvt%4eKxBMJ$<0lSEaqV-oUBK6_er0p zGA-!ym-+kwZ!oZ=Bv9lJM&5d!$ER)W+}qlDsG+$j>}@-IaNohmSk}FS6w**jTYE!m YJHLxR03s08`h<5dZ)H delta 2112 zcmXxlZHQD=7{Kx4?zr0Ox-aRP&2CMtFFS3kGqbz-wrRRnzGdc`Wm?TZMlZ4-+#&*D zBoZuYLx+MSlu!s(32H1{FeozXi`a+ykiiy#(Z&*H^r8Gv|Noskhk5Sro|${^Ip;ag z%v@hKxwJUml6X7N9w*v}L~RH~oSe#m_S>`&nsEZ>N_xGaLzl>()4ZIPL#eN)n z0ZC@KjJ(1)hgO`xo6(0hnCc`a4wy!7Sd2B8!!-7xD}NGsg@YVi!C|}&kD@6*hh2Cc zozPWuf(cg9i>+wJHlYjHiA5i@H-6(qyovrH^v3s*S15C+!_U#rzs5fNIkuIjI+4wI zFAkv#I)iT2Sls^}nNzroPUzPL^6yNOvnnZBg7!D!LVNyZToaT)Yaz2K0>96Oi9Olt}2|Mu=-ihBK zmxd|K)`6PQJx-znF2q|ghrGfz4tL|z*o7x?9)4Sl-}pU#qjh#=g&Fk1!Pp`?(NnQ! z(E+|fGjSz$5}nvzND@LVUm>@+1>Mplx+UFlzqo-Dzv{ctsw^Oj3;U5dg}2a&oIq25 z2{U*NeNYD_?eE5Fw0L);naCrr@H_`Ue+7NsakMtd6^r34C*JrOF2OI*0slk?Xea;f z)pE2Z)}SeW2EA?{I^konA7L;3^Jwk-gCrwNqjH^C8~WTu*zWg#fRkwDID-%Nqcc2& z{_wnsIXsO%_$PECv)RB0a3y;EYv_YV&;^a66aNr5;iu?0H5|OZ9g~b7)^XB@d9+I3 zL1+8{T5RXgJ)A&m;2OHJ|8N8w7}frJ=$?pNR;z)F4mR$+tT$zg{KNH6^5SO G6aEKaY_5U; diff --git a/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.po index c0c99d0..f7d276d 100644 --- a/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:43+0100\n" +"PO-Revision-Date: 2022-06-01 21:31+0200\n" "Last-Translator: \n" "Language-Team: Polish\n" "Language: pl\n" @@ -204,11 +204,11 @@ msgstr "Dane stacji" #: openplotterMaiana.py:305 msgid "provided" -msgstr "" +msgstr "dostarczone" #: openplotterMaiana.py:308 msgid "not provided" -msgstr "" +msgstr "niedostarczone" #: openplotterMaiana.py:311 msgid "Status" @@ -300,7 +300,7 @@ msgstr "Odśwież" #: openplotterMaiana.py:464 msgid "Detect noise" -msgstr "" +msgstr "Wykrywanie szumu" #: openplotterMaiana.py:467 msgid "Save station data" diff --git a/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.mo index fc12577ad1d9279134a5a0c0ba9ffe5f85bcabfa..5997c035ffe7438ee074521cc73afcf867146ec8 100644 GIT binary patch literal 6902 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 delta 87 zcmexnx{Jl)o)F7a1|VPrVi_P-0b*t#)&XJ=umBNE3=Eb)3Zw=GCQA#L2^i`c8tEDu TC>R=BnHXyu7;a7!*uw|_tP2Ws diff --git a/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po index fc41726..c234231 100644 --- a/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2021-12-10 13:43+0100\n" +"PO-Revision-Date: 2022-06-01 21:30+0200\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -22,337 +22,337 @@ msgstr "" #: data/openplotter-maiana.desktop:3 msgid "MAIANA AIS" -msgstr "" +msgstr "MAIANA AIS" #: data/openplotter-maiana.desktop:5 msgid "openplotter-maiana" -msgstr "" +msgstr "openplotter-maiana" #: fwupdate.py:26 msgid "Checking if unit is running" -msgstr "" +msgstr "Kontrollerar om enheten körs" #: fwupdate.py:42 msgid "Unit is running, switching to DFU mode" -msgstr "" +msgstr "Enheten körs, växlar till DFU-läge" #: fwupdate.py:70 msgid "Usage:" -msgstr "" +msgstr "Användning:" #: fwupdate.py:82 msgid "Unable to open serial port" -msgstr "" +msgstr "Det går inte att öppna serieporten" #: fwupdate.py:91 msgid "Unable to open file" -msgstr "" +msgstr "Det gick inte öppna filen" #: fwupdate.py:101 msgid "File size:" -msgstr "" +msgstr "Filstorlek:" #: fwupdate.py:105 msgid "Could not get unit into DFU mode" -msgstr "" +msgstr "Kunde inte skifta enheten till DFU-läge" #: fwupdate.py:109 msgid "Unit is in DFU mode" -msgstr "" +msgstr "Enheten är i DFU-läge" #: fwupdate.py:113 msgid "Unable to begin transfer, restart the unit and retry" -msgstr "" +msgstr "Det går inte att starta överföringen, starta om enheten och försök igen" #: fwupdate.py:117 msgid "Starting transfer" -msgstr "" +msgstr "Startar överföring" #: fwupdate.py:136 maianaPostInstall.py:37 maianaPostInstall.py:46 #: maianaPostInstall.py:52 maianaPreUninstall.py:36 maianaPreUninstall.py:42 msgid "FAILED: " -msgstr "" +msgstr "MISSLYCKADES: " #: maianaPostInstall.py:30 msgid "Checking access to Signal K server..." -msgstr "" +msgstr "Kontrollerar åtkomst till Signal K-server..." #: maianaPostInstall.py:36 maianaPostInstall.py:45 maianaPostInstall.py:51 #: maianaPreUninstall.py:35 maianaPreUninstall.py:41 msgid "DONE" -msgstr "" +msgstr "KLAR" #: maianaPostInstall.py:39 msgid "Adding openplotter-maiana-read service..." -msgstr "" +msgstr "Lägger till openplotter-maiana-read service..." #: maianaPostInstall.py:48 msgid "Setting version..." -msgstr "" +msgstr "Ställer in version..." #: maianaPreUninstall.py:29 msgid "Removing openplotter-maiana-read service..." -msgstr "" +msgstr "Tar bort openplotter-maiana-read service..." #: maianaPreUninstall.py:38 msgid "Removing version..." -msgstr "" +msgstr "Tar bort version..." #: openplotterMaiana.py:37 msgid "MAIANA AIS transponder" -msgstr "" +msgstr "MAIANA AIS transponder" #: openplotterMaiana.py:47 msgid "Help" -msgstr "" +msgstr "Hjälp" #: openplotterMaiana.py:50 openplotterMaiana.py:69 msgid "Settings" -msgstr "" +msgstr "Inställningar" #: openplotterMaiana.py:53 msgid "Approve" -msgstr "" +msgstr "Godkänn" #: openplotterMaiana.py:55 msgid "Allowed" -msgstr "" +msgstr "Tillåten" #: openplotterMaiana.py:58 msgid "MAIANA Signal K connection" -msgstr "" +msgstr "MAIANA Signal K anslutning" #: openplotterMaiana.py:62 msgid "Connections" -msgstr "" +msgstr "Anslutningar" #: openplotterMaiana.py:70 msgid "Firmware" -msgstr "" +msgstr "Firmware" #: openplotterMaiana.py:138 msgid "Reading MAIANA device settings..." -msgstr "" +msgstr "Läser MAIANA enhetsinställningar..." #: openplotterMaiana.py:195 msgid "Select the Signal K connection for the MAIANA device" -msgstr "" +msgstr "Välj Signal K anslutningen för MAIANA-enheten" #: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244 msgid "Cannot connect with the device, try again" -msgstr "" +msgstr "Kan inte ansluta till enheten, försök igen" #: openplotterMaiana.py:219 openplotterMaiana.py:222 msgid "The hardware version of your MAIANA device is too old" -msgstr "" +msgstr "Hårdvaruversionen av din MAIANA-enhet är för gammal" #: openplotterMaiana.py:227 openplotterMaiana.py:230 openplotterMaiana.py:233 msgid "The firmware version of your MAIANA device is too old" -msgstr "" +msgstr "Programversionen till din MAIANA-enhet är för gammal" #: openplotterMaiana.py:246 msgid "Done" -msgstr "" +msgstr "Klar" #: openplotterMaiana.py:249 msgid "Hardware revision" -msgstr "" +msgstr "Hårdvarurevision" #: openplotterMaiana.py:252 msgid "Firmware revision" -msgstr "" +msgstr "Firmware revision" #: openplotterMaiana.py:255 msgid "Type of MCU" -msgstr "" +msgstr "Typ av MCU" #: openplotterMaiana.py:258 msgid "Serial number" -msgstr "" +msgstr "Serienummer" #: openplotterMaiana.py:263 msgid "Transmitter hardware module" -msgstr "" +msgstr "Sändare hårdvarumodul" #: openplotterMaiana.py:268 msgid "present" -msgstr "" +msgstr "tillgänglig" #: openplotterMaiana.py:271 msgid "not present" -msgstr "" +msgstr "inte tillgänglig" #: openplotterMaiana.py:274 msgid "Hardware TX switch" -msgstr "" +msgstr "Hårdvara TX brytare" #: openplotterMaiana.py:279 openplotterMaiana.py:291 msgid "ON" -msgstr "" +msgstr "PÅ" #: openplotterMaiana.py:282 openplotterMaiana.py:296 msgid "OFF" -msgstr "" +msgstr "AV" #: openplotterMaiana.py:285 openplotterMaiana.py:461 msgid "Software TX switch" -msgstr "" +msgstr "Mjukvara TX brytare" #: openplotterMaiana.py:300 msgid "Station data" -msgstr "" +msgstr "Stationsdata" #: openplotterMaiana.py:305 msgid "provided" -msgstr "" +msgstr "angiven" #: openplotterMaiana.py:308 msgid "not provided" -msgstr "" +msgstr "inte angiven" #: openplotterMaiana.py:311 msgid "Status" -msgstr "" +msgstr "Status" #: openplotterMaiana.py:316 msgid "transmitting" -msgstr "" +msgstr "sänder" #: openplotterMaiana.py:319 msgid "not transmitting" -msgstr "" +msgstr "sänder inte" #: openplotterMaiana.py:322 msgid "Channel A latest transmitted message" -msgstr "" +msgstr "Kanal A senast överförda meddelande" #: openplotterMaiana.py:328 openplotterMaiana.py:341 msgid "Type" -msgstr "" +msgstr "Typ" #: openplotterMaiana.py:332 openplotterMaiana.py:344 msgid "Time" -msgstr "" +msgstr "Tid" #: openplotterMaiana.py:335 msgid "Channel B latest transmitted message" -msgstr "" +msgstr "Kanal B senast överförda meddelande" #: openplotterMaiana.py:347 msgid "Channel A noise floor" -msgstr "" +msgstr "Kanal A ljudnivå" #: openplotterMaiana.py:352 msgid "Channel B noise floor" -msgstr "" +msgstr "Kanal B ljudnivå" #: openplotterMaiana.py:376 msgid " Press \"Approve\" and then \"Refresh\"." -msgstr "" +msgstr " Tryck på \"Godkänn\" och sedan \"Uppdatera\"." #: openplotterMaiana.py:380 msgid " Press \"Refresh\"." -msgstr "" +msgstr " Tryck på \"Uppdatera\"." #: openplotterMaiana.py:382 msgid " Press \"Allowed\"." -msgstr "" +msgstr " Tryck på \"Tillåten\"." #: openplotterMaiana.py:439 msgid "MMSI" -msgstr "" +msgstr "MMSI" #: openplotterMaiana.py:441 msgid "Vessel name" -msgstr "" +msgstr "Fartygets namn" #: openplotterMaiana.py:443 msgid "Call sign" -msgstr "" +msgstr "Anropssignal" #: openplotterMaiana.py:445 msgid "Vessel type" -msgstr "" +msgstr "Fartygstyp" #: openplotterMaiana.py:447 msgid "LOA" -msgstr "" +msgstr "LÖA" #: openplotterMaiana.py:449 msgid "Beam" -msgstr "" +msgstr "Bredd" #: openplotterMaiana.py:451 msgid "Port Offset" -msgstr "" +msgstr "Förskjutning Babord" #: openplotterMaiana.py:453 msgid "Bow Offset" -msgstr "" +msgstr "Förskjutning För" #: openplotterMaiana.py:455 msgid "Units: meters" -msgstr "" +msgstr "Enhet: meter" #: openplotterMaiana.py:458 openplotterMaiana.py:575 msgid "Refresh" -msgstr "" +msgstr "Uppdatera" #: openplotterMaiana.py:464 msgid "Detect noise" -msgstr "" +msgstr "Identifiera störningar" #: openplotterMaiana.py:467 msgid "Save station data" -msgstr "" +msgstr "Spara stationsdata" #: openplotterMaiana.py:514 msgid "Invalid MMSI" -msgstr "" +msgstr "Ogiltig MMSI" #: openplotterMaiana.py:520 msgid "Invalid vessel name" -msgstr "" +msgstr "Ogiltigt fartygsnamn" #: openplotterMaiana.py:525 msgid "Invalid call sign" -msgstr "" +msgstr "Ogiltig anropssignal" #: openplotterMaiana.py:534 msgid "Invalid vessel type" -msgstr "" +msgstr "Ogiltig fartygstyp" #: openplotterMaiana.py:539 msgid "Invalid LOA" -msgstr "" +msgstr "Ogiltig LÖA" #: openplotterMaiana.py:544 msgid "Invalid Beam" -msgstr "" +msgstr "Ogiltig Bredd" #: openplotterMaiana.py:549 msgid "Invalid bow offset" -msgstr "" +msgstr "Ogiltig förskjutning i babordsled" #: openplotterMaiana.py:554 msgid "Invalid port offset" -msgstr "" +msgstr "Ogiltig förskjutning i förhållande till fören" #: openplotterMaiana.py:578 msgid "Update firmware" -msgstr "" +msgstr "Uppdatera firmware" #: openplotterMaiana.py:591 msgid "Choose a file" -msgstr "" +msgstr "Välj en fil" #: openplotterMaiana.py:591 msgid "bin files" -msgstr "" +msgstr "binära filer" #: openplotterMaiana.py:591 msgid "All files" -msgstr "" +msgstr "Alla filer" #: openplotterMaiana.py:597 msgid "" @@ -360,47 +360,50 @@ msgid "" "\n" "Do you want to go ahead?" msgstr "" +"Din MAIANA enhets firmware kommer att uppdateras, vänligen koppla inte från eller mixtra med den under uppdateringen.\n" +"\n" +"Vill du gå vidare?" #: openplotterMaiana.py:598 msgid "Question" -msgstr "" +msgstr "Fråga" #: openplotterMaiana.py:601 msgid "Stopping Signal K server" -msgstr "" +msgstr "Stoppar Signal K servern" #: openplotterMaiana.py:608 msgid "Updating firmware, please wait... " -msgstr "" +msgstr "Uppdaterar firmware, vänligen vänta... " #: openplotterMaiana.py:610 msgid "Starting Signal K server" -msgstr "" +msgstr "Startar Signal K server" #: openplotterMaianaRead.py:74 msgid "There may be electromagnetic interference near the MAIANA AIS antenna" -msgstr "" +msgstr "Det kan finnas elektromagnetiska störningar nära MAIANA AIS antennen" #: startup.py:43 msgid "Checking MAIANA transponder..." -msgstr "" +msgstr "Kontrollerar MAIANA transponder..." #: startup.py:53 msgid "There is no MAIANA device defined" -msgstr "" +msgstr "Det finns ingen MAIANA enhet definierad" #: startup.py:57 msgid "MAIANA device" -msgstr "" +msgstr "MAIANA enhet" #: startup.py:68 msgid "Access to Signal K server validated" -msgstr "" +msgstr "Åtkomst till Signal K servern validerad" #: startup.py:76 startup.py:86 msgid "OpenPlotter MAIANA service is running" -msgstr "" +msgstr "OpenPlotter MAIANA tjänsten körs" #: startup.py:80 startup.py:90 msgid "OpenPlotter MAIANA service is not running" -msgstr "" +msgstr "OpenPlotter MAIANA tjänsten körs inte" diff --git a/openplotterMaiana/openplotterMaiana.py b/openplotterMaiana/openplotterMaiana.py index b7bbe7c..62792b2 100644 --- a/openplotterMaiana/openplotterMaiana.py +++ b/openplotterMaiana/openplotterMaiana.py @@ -528,7 +528,7 @@ class MyFrame(wx.Frame): vesselName = self.vesselName.GetValue() vesselName = vesselName.upper() - if not re.match('^[0-9A-Z]{1,20}$', vesselName): + if not re.match('^[0-9A-Z ]{1,20}$', vesselName): self.ShowStatusBarRED(_('Invalid vessel name')) return diff --git a/openplotterMaiana/version.py b/openplotterMaiana/version.py index a8f39f2..4cf791e 100644 --- a/openplotterMaiana/version.py +++ b/openplotterMaiana/version.py @@ -1,3 +1,3 @@ -version = '3.1.2' +version = '3.1.3' codeName = 'STOPmaremortum' state = 'beta' \ No newline at end of file From 552d2382fd817a00e5ad4afdb8bb2a71ab66dc86 Mon Sep 17 00:00:00 2001 From: sailoog Date: Sat, 2 Jul 2022 20:35:27 +0200 Subject: [PATCH 11/12] update translation --- .../ca/LC_MESSAGES/openplotter-maiana.mo | Bin 7099 -> 7099 bytes .../ca/LC_MESSAGES/openplotter-maiana.po | 2 +- .../cs/LC_MESSAGES/openplotter-maiana.mo | Bin 6981 -> 6981 bytes .../cs/LC_MESSAGES/openplotter-maiana.po | 2 +- .../da/LC_MESSAGES/openplotter-maiana.mo | Bin 4212 -> 4212 bytes .../da/LC_MESSAGES/openplotter-maiana.po | 2 +- .../de/LC_MESSAGES/openplotter-maiana.mo | Bin 7019 -> 7019 bytes .../de/LC_MESSAGES/openplotter-maiana.po | 2 +- .../el/LC_MESSAGES/openplotter-maiana.mo | Bin 565 -> 565 bytes .../el/LC_MESSAGES/openplotter-maiana.po | 2 +- .../en/LC_MESSAGES/openplotter-maiana.mo | Bin 424 -> 424 bytes .../en/LC_MESSAGES/openplotter-maiana.po | 2 +- .../es/LC_MESSAGES/openplotter-maiana.mo | Bin 7176 -> 7176 bytes .../es/LC_MESSAGES/openplotter-maiana.po | 2 +- .../fi/LC_MESSAGES/openplotter-maiana.mo | Bin 6927 -> 6927 bytes .../fi/LC_MESSAGES/openplotter-maiana.po | 2 +- .../fr/LC_MESSAGES/openplotter-maiana.mo | Bin 7336 -> 7336 bytes .../fr/LC_MESSAGES/openplotter-maiana.po | 2 +- .../it/LC_MESSAGES/openplotter-maiana.mo | Bin 567 -> 567 bytes .../it/LC_MESSAGES/openplotter-maiana.po | 2 +- .../nb/LC_MESSAGES/openplotter-maiana.mo | Bin 4259 -> 6768 bytes .../nb/LC_MESSAGES/openplotter-maiana.po | 77 +++++++++--------- .../nl/LC_MESSAGES/openplotter-maiana.mo | Bin 565 -> 565 bytes .../nl/LC_MESSAGES/openplotter-maiana.po | 2 +- .../pl/LC_MESSAGES/openplotter-maiana.mo | Bin 7291 -> 7291 bytes .../pl/LC_MESSAGES/openplotter-maiana.po | 2 +- .../sv/LC_MESSAGES/openplotter-maiana.mo | Bin 6902 -> 6902 bytes .../sv/LC_MESSAGES/openplotter-maiana.po | 2 +- 28 files changed, 53 insertions(+), 50 deletions(-) diff --git a/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.mo index c866ba50a6421a526103b5c04c47d55cd3e921be..fcaaacd79b62921b1954621c094459e3a37dbc27 100644 GIT binary patch delta 23 ecmdmOzT135hya(lu7Qz)k%5)5>E<|rSZ)AU!v=N$ delta 23 ecmdmOzT135hya(Fu7RO~k)f5b;pRAjSZ)AUnFetH diff --git a/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po index 10e522f..c5d2298 100644 --- a/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:35+0200\n" "Last-Translator: \n" "Language-Team: Catalan\n" "Language: ca\n" diff --git a/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.mo index 7443d3990e12615a9c0e18256446d1c7ead5d3d8..a613b3d2e1e8b08109ae5ab9614a80741d269f84 100644 GIT binary patch delta 23 ecmX?VcGPS`hya(lu7Qz)k%5)5>E<|r=Uf01JClb2b24Dh5FS delta 23 ecmeyO@I_&RF&CGau7RO~k)f5b;bvPdb2b2400uk& diff --git a/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po index 0e482ba..e8c7bb1 100644 --- a/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:35+0200\n" "Last-Translator: \n" "Language-Team: Danish\n" "Language: da\n" diff --git a/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.mo index 86a3c8fa6fa491c1035092cd3ddd7c24d6d543b7..5889adda3e9fd8b6658b2704a663b71ace11dcff 100644 GIT binary patch delta 23 ecmaED_S$Sihya(lu7Qz)k%5)5$>ul#UTy$iGX{eI delta 23 ecmaED_S$Sihya(Fu7RO~k)f5b;pR92UTy$i4+eh# diff --git a/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po index f7b7f9b..1289c35 100644 --- a/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: German\n" "Language: de\n" diff --git a/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.mo index 976e696aaf2db4bb56e17a3b58fbdfd06b466e6d..65cd89d24ad535721b1a05b46f35a396205cb4ee 100644 GIT binary patch delta 21 ccmdnWvXx~*A(y$Xfsuldft9hz#_C;+07cXWP5=M^ delta 21 ccmdnWvXx~*A(xr1fuVwtp_Q@W#_C;+07bM0N&o-= diff --git a/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po index f59753f..11b84eb 100644 --- a/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: Greek\n" "Language: el\n" diff --git a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.mo index dc4d8b14076b701c0f941e56d15d7ebe593e42ae..a4b0949b20666aee2deb1e6f87cf2e6da428d185 100644 GIT binary patch delta 21 ccmZ3%yn=Z`1(&(5fsuldft9hz#wImJ07C->tN;K2 delta 21 ccmZ3%yn=Z`1(%twfuVwtp_Q@0#wImJ07BjcrvLx| diff --git a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po index 0e15c07..6e08681 100644 --- a/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter-maiana\n" "POT-Creation-Date: 2022-05-21 21:09+0200\n" -"PO-Revision-Date: 2022-06-01 21:30+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" diff --git a/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.mo index 4c86cbdf3c735a94953a4f7892b8644721a7191e..10bc7c27b441036fc02ec9a0af927ff9a4059fa3 100644 GIT binary patch delta 23 ecmeCM=&;xjBEV&?Yha{cWME}%vN=v*6*mA+y#`(Y delta 23 ecmeCM=&;xjBEV&)Yhb8gWN2k6*mA+nFd+_ diff --git a/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po index d8afc43..ba4a41c 100644 --- a/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es\n" diff --git a/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.mo index 8b48e81fd34852c6face97e4079a81956d86a7f4..be2d59b8f7428693ceb2f8263e29718d2cd7948a 100644 GIT binary patch delta 23 ecmeA->o?mFBEV&?Yha{cWME}%vN=v*BNqTrss?TV delta 23 ecmeA->o?mFBEV&)Yhb8gWN2kBNqTrh6ZW? diff --git a/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po index 6dd0e15..034d483 100644 --- a/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: Finnish\n" "Language: fi\n" diff --git a/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.mo index 5c289d7a0d86e0199841427082208abf91dbd546..d58f63e04872cac492a5a50bd3d1e1969f9f4691 100644 GIT binary patch delta 23 ecmZ2sxx#Wohya(lu7Qz)k%5)5$>ul#FCG9?s0Kj* delta 23 ecmZ2sxx#Wohya(Fu7RO~k)f5b;pR92FCG9?ga$nT diff --git a/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po index 3aa9992..eedfe84 100644 --- a/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr\n" diff --git a/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.mo index fad6477dfcfb1dd26d1bfaf33560e7972ee9a961..bd38fe3e54e8de7f8477de695508c8444ba1c120 100644 GIT binary patch delta 21 ccmdnavYll@A(y$Xfsuldft9hz#_Bzc07fVVQ~&?~ delta 21 ccmdnavYll@A(xr1fuVwtp_Q@W#_Bzc07eJ~Pyhe` diff --git a/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po index dca1842..66951bd 100644 --- a/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: Italian\n" "Language: it\n" diff --git a/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.mo index cce6230acc2ec6f08a477d1aa7f23119befc689f..eeeb24052ceebc5f36c241cace24c861432aff85 100644 GIT binary patch literal 6768 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 Hf*t<=&`Fr( diff --git a/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po index 2e39490..86b7550 100644 --- a/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:30+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -256,103 +256,103 @@ msgstr " Trykk på \"Oppdater\"." #: openplotterMaiana.py:382 msgid " Press \"Allowed\"." -msgstr "" +msgstr " Trykk \"Tillatt\"." #: openplotterMaiana.py:439 msgid "MMSI" -msgstr "" +msgstr "MMSI" #: openplotterMaiana.py:441 msgid "Vessel name" -msgstr "" +msgstr "Navn på fartøy" #: openplotterMaiana.py:443 msgid "Call sign" -msgstr "" +msgstr "Kallesignal" #: openplotterMaiana.py:445 msgid "Vessel type" -msgstr "" +msgstr "Type fartøy" #: openplotterMaiana.py:447 msgid "LOA" -msgstr "" +msgstr "LOA" #: openplotterMaiana.py:449 msgid "Beam" -msgstr "" +msgstr "Bredde" #: openplotterMaiana.py:451 msgid "Port Offset" -msgstr "" +msgstr "Babord forskyvning" #: openplotterMaiana.py:453 msgid "Bow Offset" -msgstr "" +msgstr "Baug-forskyvning" #: openplotterMaiana.py:455 msgid "Units: meters" -msgstr "" +msgstr "Enheter: meter" #: openplotterMaiana.py:458 openplotterMaiana.py:575 msgid "Refresh" -msgstr "" +msgstr "Oppdater" #: openplotterMaiana.py:464 msgid "Detect noise" -msgstr "" +msgstr "Oppdag støy" #: openplotterMaiana.py:467 msgid "Save station data" -msgstr "" +msgstr "Lagre stasjonsdata" #: openplotterMaiana.py:514 msgid "Invalid MMSI" -msgstr "" +msgstr "Ugyldig MMSI" #: openplotterMaiana.py:520 msgid "Invalid vessel name" -msgstr "" +msgstr "Ugyldig fartøynavn" #: openplotterMaiana.py:525 msgid "Invalid call sign" -msgstr "" +msgstr "Ugyldig kallesignal" #: openplotterMaiana.py:534 msgid "Invalid vessel type" -msgstr "" +msgstr "Ugyldig fartøystype" #: openplotterMaiana.py:539 msgid "Invalid LOA" -msgstr "" +msgstr "Ugyldig LOA" #: openplotterMaiana.py:544 msgid "Invalid Beam" -msgstr "" +msgstr "Ugyldig bredde" #: openplotterMaiana.py:549 msgid "Invalid bow offset" -msgstr "" +msgstr "Ugyldig baug-forskyvning" #: openplotterMaiana.py:554 msgid "Invalid port offset" -msgstr "" +msgstr "Ugyldig babord-forskyvning" #: openplotterMaiana.py:578 msgid "Update firmware" -msgstr "" +msgstr "Oppdater fastvare" #: openplotterMaiana.py:591 msgid "Choose a file" -msgstr "" +msgstr "Velg en fil" #: openplotterMaiana.py:591 msgid "bin files" -msgstr "" +msgstr "binærfiler" #: openplotterMaiana.py:591 msgid "All files" -msgstr "" +msgstr "Alle filer" #: openplotterMaiana.py:597 msgid "" @@ -360,47 +360,50 @@ msgid "" "\n" "Do you want to go ahead?" msgstr "" +"Din MAIANA-enhet fastvare vil bli oppdatert, vennligst ikke koble fra eller rør den under oppdateringen.\n" +"\n" +"Vil du fortsette i gang?" #: openplotterMaiana.py:598 msgid "Question" -msgstr "" +msgstr "Spørsmål" #: openplotterMaiana.py:601 msgid "Stopping Signal K server" -msgstr "" +msgstr "Stopper Signal K server" #: openplotterMaiana.py:608 msgid "Updating firmware, please wait... " -msgstr "" +msgstr "Oppdaterer fastvare, vennligst vent... " #: openplotterMaiana.py:610 msgid "Starting Signal K server" -msgstr "" +msgstr "Starter Signal K server på nytt" #: openplotterMaianaRead.py:74 msgid "There may be electromagnetic interference near the MAIANA AIS antenna" -msgstr "" +msgstr "Det kan være elektromagnetisk interferens i nærheten av MAIANA AIS-antennen" #: startup.py:43 msgid "Checking MAIANA transponder..." -msgstr "" +msgstr "Sjekker MAIANA transponder..." #: startup.py:53 msgid "There is no MAIANA device defined" -msgstr "" +msgstr "Det finnes ingen MAIANA-enhet definert" #: startup.py:57 msgid "MAIANA device" -msgstr "" +msgstr "MAIANA-enhet" #: startup.py:68 msgid "Access to Signal K server validated" -msgstr "" +msgstr "Tilgang til Signal K-server validert" #: startup.py:76 startup.py:86 msgid "OpenPlotter MAIANA service is running" -msgstr "" +msgstr "OpenPlotter MAIANA-tjenesten kjører" #: startup.py:80 startup.py:90 msgid "OpenPlotter MAIANA service is not running" -msgstr "" +msgstr "OpenPlotter MAIANA-tjenesten kjører ikke" diff --git a/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.mo index 60f476dce45f9b17fb7df75cbedcfc5f86e9c777..cf633eb53ce1ca50f5dbe99da8001c01cc7c2fee 100644 GIT binary patch delta 21 ccmdnWvXx~*A(y$Xfsuldft9hz#_C;+07cXWP5=M^ delta 21 ccmdnWvXx~*A(xr1fuVwtp_Q@W#_C;+07bM0N&o-= diff --git a/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po index f75dbdc..a1ec236 100644 --- a/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:31+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: Dutch\n" "Language: nl\n" diff --git a/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.mo b/openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.mo index a0f279b6e5de011df01608d2cbd3061cf253780c..25b70cf9cf0450c2bb694bd3ed2cac6a4e3fc0c2 100644 GIT binary patch delta 23 ecmexu@!MiUhya(lu7Qz)k%5)5$>ul#SsnmlXa=|d delta 23 ecmexu@!MiUhya(Fu7RO~k)f5b;pR92SsnmlLunL8C(Ej0tX=g delta 23 ecmexn`ptAhhya(Fu7RO~k)f5b!R9!D8C(Ei*asW{ diff --git a/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po b/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po index c234231..af8f397 100644 --- a/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po +++ b/openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: openplotter\n" "POT-Creation-Date: 2021-11-25 17:49+0100\n" -"PO-Revision-Date: 2022-06-01 21:30+0200\n" +"PO-Revision-Date: 2022-07-02 20:34+0200\n" "Last-Translator: \n" "Language-Team: Swedish\n" "Language: sv\n" From de623b51e043433e6ecdaa4320ad99d399606da2 Mon Sep 17 00:00:00 2001 From: sailoog Date: Sat, 2 Jul 2022 20:42:56 +0200 Subject: [PATCH 12/12] version 3.1.4 stable --- debian/changelog | 10 ++++++++++ openplotterMaiana/version.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4550c7..d99b907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +openplotter-maiana (3.1.4-stable) bullseye; urgency=medium + + * Remove service and make daemon to be run by openplotter startup process + * Add actions for openplotter-notifications + * Improve firmware update process + * Fix errors + * Update translations + + -- Sailoog Sat, 02 Jul 2022 20:36:02 +0200 + openplotter-maiana (3.1.3-beta) bullseye; urgency=medium * Beta diff --git a/openplotterMaiana/version.py b/openplotterMaiana/version.py index 4cf791e..3a50571 100644 --- a/openplotterMaiana/version.py +++ b/openplotterMaiana/version.py @@ -1,3 +1,3 @@ -version = '3.1.3' +version = '3.1.4' codeName = 'STOPmaremortum' -state = 'beta' \ No newline at end of file +state = 'stable' \ No newline at end of file