From 47fe54ac000da2fc79db9c0a220d06f484e96a2e Mon Sep 17 00:00:00 2001 From: Sailoog Date: Sat, 29 Feb 2020 19:25:29 +0100 Subject: [PATCH 1/3] first release --- README.md | 9 +- debian/changelog | 4 +- debian/control | 6 +- debian/rules | 0 .../en/LC_MESSAGES/openplotter-kplex.mo | Bin 463 -> 468 bytes .../en/LC_MESSAGES/openplotter-kplex.po | 234 ++++++++---------- openplotterKplex/openplotterKplex.py | 2 +- setup.py | 2 +- 8 files changed, 118 insertions(+), 139 deletions(-) mode change 100644 => 100755 debian/rules diff --git a/README.md b/README.md index e18cff8..ded0907 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## openplotter-kplex -OpenPlotter app to manage kplex devices +OpenPlotter app to manage NMEA 0183 data ### Installing @@ -12,10 +12,9 @@ Install [openplotter-settings](https://github.com/openplotter/openplotter-settin Install [openplotter-settings](https://github.com/openplotter/openplotter-settings) for **development**. -Install dependencies: -Download kplex from http://www.stripydog.com/kplex/download.html +Install openplotter-kplex dependencies: -`dpkg -i ./kplex_1.x-x_xxx.deb` +`sudo apt install gpsd gpsd-clients kplex` Clone the repository: @@ -43,7 +42,7 @@ Run: `openplotter-kplex` -Make your changes and repeat package, installation and post-installation steps to test. 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/). +Make your changes and repeat package, installation and post-installation steps 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). ### Documentation diff --git a/debian/changelog b/debian/changelog index 5ffa95c..c637b76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -openplotter-kplex (2.0.0-dev) buster; urgency=medium +openplotter-kplex (2.0.0-dev) bionic; urgency=medium - * Release Candidate + * Development release -- Sailoog Fri, 22 Feb 2020 13:41:02 +0100 diff --git a/debian/control b/debian/control index 88b8e37..4f51d13 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,6 @@ X-Python3-Version: >= 3.2 Package: openplotter-kplex Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings, python3-pyudev, kplex -Description: OpenPlotter app to manage kplex devices - OpenPlotter app to manage kplex devices +Depends: ${misc:Depends}, ${python3:Depends}, gpsd, gpsd-clients, kplex +Description: OpenPlotter app to manage NMEA 0183 data + OpenPlotter app to manage NMEA 0183 data diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo index 6075addf7668b8e2624486f9b60da10162812b76..f4c8755c06463611e4deed791bffc34bc65e5188 100644 GIT binary patch delta 107 zcmX@le1&;}3gfJaswR5b1v#k|Tmk+ey3R$Zi6xo&dAcr%C8<^lMg~R(x&}tNMwSYO z7FMR_+6IOO1{33DFxtV#T#d=TyhxA;a Xj9zknuHD3gJ*-B0MtUZbLl_$X0NN=S diff --git a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po index 22801ae..5bd6a05 100644 --- a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po +++ b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po @@ -1,15 +1,15 @@ msgid "" msgstr "" -"Project-Id-Version: openplotter-serial\n" -"POT-Creation-Date: 2020-02-26 22:49+0100\n" -"PO-Revision-Date: 2020-02-26 22:49+0100\n" -"Last-Translator: e-sailing \n" +"Project-Id-Version: openplotter-kplex\n" +"POT-Creation-Date: 2020-02-29 18:57+0100\n" +"PO-Revision-Date: 2020-02-29 18:57+0100\n" +"Last-Translator: \n" "Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 1.8.7.1\n" "X-Poedit-Basepath: ../../..\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -23,11 +23,11 @@ msgstr "" msgid " settings " msgstr "" -#: add_kplex.py:41 diagnostic-NMEA.py:57 openplotterKplex.py:197 +#: add_kplex.py:41 diagnostic-NMEA.py:57 openplotterKplex.py:128 msgid "Type" msgstr "" -#: add_kplex.py:50 openplotterKplex.py:196 +#: add_kplex.py:50 openplotterKplex.py:127 msgid "Name" msgstr "" @@ -47,157 +47,149 @@ msgstr "" msgid "Address" msgstr "" -#: add_kplex.py:136 +#: add_kplex.py:137 msgid "in Filter " msgstr "" -#: add_kplex.py:138 add_kplex.py:179 add_kplex.py:296 add_kplex.py:304 -#: add_kplex.py:384 add_kplex.py:527 add_kplex.py:551 add_kplex.py:622 -#: add_kplex.py:626 add_kplex.py:630 add_kplex.py:653 openplotterKplex.py:346 -#: openplotterKplex.py:358 openplotterKplex.py:404 openplotterKplex.py:406 +#: add_kplex.py:139 add_kplex.py:182 add_kplex.py:299 add_kplex.py:307 +#: add_kplex.py:387 add_kplex.py:534 add_kplex.py:558 add_kplex.py:629 +#: add_kplex.py:633 add_kplex.py:637 add_kplex.py:660 openplotterKplex.py:335 +#: openplotterKplex.py:347 openplotterKplex.py:413 openplotterKplex.py:415 msgid "none" msgstr "" -#: add_kplex.py:138 add_kplex.py:179 add_kplex.py:633 add_kplex.py:656 +#: add_kplex.py:139 add_kplex.py:182 add_kplex.py:640 add_kplex.py:663 msgid "Accept only sentences:" msgstr "" -#: add_kplex.py:138 add_kplex.py:179 add_kplex.py:643 add_kplex.py:667 +#: add_kplex.py:139 add_kplex.py:182 add_kplex.py:650 add_kplex.py:674 msgid "Ignore sentences:" msgstr "" -#: add_kplex.py:143 add_kplex.py:183 +#: add_kplex.py:144 add_kplex.py:186 msgid "-" msgstr "" -#: add_kplex.py:160 add_kplex.py:202 +#: add_kplex.py:163 add_kplex.py:205 msgid "Add sentence" msgstr "" -#: add_kplex.py:163 add_kplex.py:204 +#: add_kplex.py:166 add_kplex.py:207 msgid "Delete" msgstr "" -#: add_kplex.py:177 +#: add_kplex.py:180 msgid "out Filter " msgstr "" -#: add_kplex.py:218 add_kplex.py:222 add_kplex.py:323 add_kplex.py:325 -#: add_kplex.py:337 add_kplex.py:339 add_kplex.py:350 add_kplex.py:352 -#: add_kplex.py:379 add_kplex.py:381 add_kplex.py:400 add_kplex.py:403 -#: add_kplex.py:424 add_kplex.py:450 add_kplex.py:526 add_kplex.py:550 -#: add_kplex.py:622 add_kplex.py:626 add_kplex.py:631 add_kplex.py:633 -#: add_kplex.py:644 add_kplex.py:654 add_kplex.py:657 add_kplex.py:668 -#: openplotterKplex.py:350 openplotterKplex.py:362 openplotterKplex.py:404 -#: openplotterKplex.py:406 +#: add_kplex.py:221 add_kplex.py:225 add_kplex.py:326 add_kplex.py:328 +#: add_kplex.py:340 add_kplex.py:342 add_kplex.py:353 add_kplex.py:355 +#: add_kplex.py:382 add_kplex.py:384 add_kplex.py:403 add_kplex.py:406 +#: add_kplex.py:429 add_kplex.py:455 add_kplex.py:533 add_kplex.py:557 +#: add_kplex.py:629 add_kplex.py:633 add_kplex.py:638 add_kplex.py:640 +#: add_kplex.py:651 add_kplex.py:661 add_kplex.py:664 add_kplex.py:675 +#: openplotterKplex.py:339 openplotterKplex.py:351 openplotterKplex.py:413 +#: openplotterKplex.py:415 msgid "nothing" msgstr "" -#: add_kplex.py:226 +#: add_kplex.py:229 msgid "getSK examp" msgstr "" -#: add_kplex.py:229 +#: add_kplex.py:232 msgid "putSK examp" msgstr "" -#: add_kplex.py:232 +#: add_kplex.py:235 msgid "AP examp" msgstr "" -#: add_kplex.py:235 +#: add_kplex.py:238 msgid "GPS examp" msgstr "" -#: add_kplex.py:238 +#: add_kplex.py:241 msgid "gpsd examp" msgstr "" -#: add_kplex.py:241 +#: add_kplex.py:244 msgid "OK" msgstr "" -#: add_kplex.py:297 add_kplex.py:305 openplotterKplex.py:347 -#: openplotterKplex.py:359 +#: add_kplex.py:300 add_kplex.py:308 openplotterKplex.py:336 +#: openplotterKplex.py:348 msgid "accept" msgstr "" -#: add_kplex.py:299 add_kplex.py:307 openplotterKplex.py:348 -#: openplotterKplex.py:360 +#: add_kplex.py:302 add_kplex.py:310 openplotterKplex.py:337 +#: openplotterKplex.py:349 msgid "ignore" msgstr "" -#: add_kplex.py:410 add_kplex.py:434 +#: add_kplex.py:413 add_kplex.py:439 msgid "" "Talker must have 2 uppercase characters. The symbol * matches any character." msgstr "" -#: add_kplex.py:413 add_kplex.py:437 +#: add_kplex.py:416 add_kplex.py:442 msgid "" "Sentence must have 3 uppercase characters. The symbol * matches any " "character." msgstr "" -#: add_kplex.py:419 add_kplex.py:445 +#: add_kplex.py:424 add_kplex.py:450 msgid "" "You must enter 2 uppercase characters for talker or 3 uppercase characters " "for sentence. The symbol * matches any character." msgstr "" -#: add_kplex.py:422 add_kplex.py:448 +#: add_kplex.py:427 add_kplex.py:453 msgid "This sentence already exists." msgstr "" -#: add_kplex.py:573 +#: add_kplex.py:580 msgid "" "\"Name\" must be a string between 1 and 13 lowercase letters and/or numbers " "which is not used as name for another input/output." msgstr "" -#: add_kplex.py:578 +#: add_kplex.py:585 msgid "This name is already in use." msgstr "" -#: add_kplex.py:582 +#: add_kplex.py:589 msgid "This name is reserved by the system." msgstr "" -#: add_kplex.py:589 +#: add_kplex.py:596 msgid "You must select a Port." msgstr "" -#: add_kplex.py:594 +#: add_kplex.py:601 msgid "This output is already in use." msgstr "" -#: add_kplex.py:603 +#: add_kplex.py:610 msgid "You must enter an Address." msgstr "" -#: add_kplex.py:608 +#: add_kplex.py:615 msgid "You must enter a Port." msgstr "" -#: add_kplex.py:612 +#: add_kplex.py:619 msgid "Cancelled. Port 10111-10113 are reserved." msgstr "" -#: add_kplex.py:619 +#: add_kplex.py:626 msgid "This input is already in use." msgstr "" -#: add_kplex.py:623 add_kplex.py:627 +#: add_kplex.py:630 add_kplex.py:634 msgid "You must select a Filter type." msgstr "" -#: data/openplotter-kplex.desktop:3 -msgid "Kplex" -msgstr "" - -#: data/openplotter-kplex.desktop:5 -msgid "kplex" -msgstr "" - #: diagnostic-NMEA.py:56 msgid "Device" msgstr "" @@ -242,17 +234,17 @@ msgstr "" msgid "Adding kplex service..." msgstr "" -#: kplexPostInstall.py:50 kplexPostInstall.py:56 kplexPreUninstall.py:34 +#: kplexPostInstall.py:34 kplexPostInstall.py:40 kplexPreUninstall.py:34 #: kplexPreUninstall.py:40 msgid "DONE" msgstr "" -#: kplexPostInstall.py:51 kplexPostInstall.py:57 kplexPreUninstall.py:35 +#: kplexPostInstall.py:35 kplexPostInstall.py:41 kplexPreUninstall.py:35 #: kplexPreUninstall.py:41 msgid "FAILED: " msgstr "" -#: kplexPostInstall.py:53 +#: kplexPostInstall.py:37 msgid "Setting version..." msgstr "" @@ -264,127 +256,115 @@ msgstr "" msgid "Removing version..." msgstr "" -#: openplotterKplex.py:52 -msgid "Kplex (NMEA 0183 multiplexer) Graphical user interface" -msgstr "" - -#: openplotterKplex.py:62 +#: openplotterKplex.py:61 msgid "Help" msgstr "" -#: openplotterKplex.py:65 +#: openplotterKplex.py:64 msgid "Settings" msgstr "" -#: openplotterKplex.py:68 -msgid "SK Connection" -msgstr "" - -#: openplotterKplex.py:70 -msgid "OP Serial" +#: openplotterKplex.py:67 +msgid "Refresh" msgstr "" #: openplotterKplex.py:73 -msgid "restart" -msgstr "" - -#: openplotterKplex.py:75 -msgid "manual settings" +msgid "Devices" msgstr "" -#: openplotterKplex.py:78 -msgid "Apply changes" +#: openplotterKplex.py:129 +msgid "io" msgstr "" -#: openplotterKplex.py:85 -msgid "Devices" +#: openplotterKplex.py:130 +msgid "Port/Address" msgstr "" -#: openplotterKplex.py:142 -msgid "Closing Kplex" +#: openplotterKplex.py:131 +msgid "Bauds/Port" msgstr "" -#: openplotterKplex.py:156 -msgid "Kplex running" +#: openplotterKplex.py:132 +msgid "inFilter" msgstr "" -#: openplotterKplex.py:164 -msgid "Error: Can't restart Kplex" +#: openplotterKplex.py:133 openplotterKplex.py:135 +msgid "Filtering" msgstr "" -#: openplotterKplex.py:166 -msgid "Kplex restarted" +#: openplotterKplex.py:134 +msgid "outFilter" msgstr "" -#: openplotterKplex.py:175 -msgid "Please install \"Signal K Installer\" OpenPlotter app" +#: openplotterKplex.py:138 +msgid "Diagnostic" msgstr "" -#: openplotterKplex.py:183 -msgid "Please install \"Serial\" OpenPlotter app" +#: openplotterKplex.py:141 +msgid "add network" msgstr "" -#: openplotterKplex.py:188 -msgid "" -"Add manual settings at the end of the configuration file. Restart to apply " -"changes." +#: openplotterKplex.py:143 +msgid "delete" msgstr "" -#: openplotterKplex.py:192 -msgid "Editor mousepad not found" +#: openplotterKplex.py:146 +msgid "Restart" msgstr "" -#: openplotterKplex.py:198 -msgid "io" +#: openplotterKplex.py:148 +msgid "Advanced" msgstr "" -#: openplotterKplex.py:199 -msgid "Port/Address" +#: openplotterKplex.py:150 +msgid "Apply changes" msgstr "" -#: openplotterKplex.py:200 -msgid "Bauds/Port" +#: openplotterKplex.py:152 +msgid "Cancel changes" msgstr "" -#: openplotterKplex.py:201 -msgid "inFilter" +#: openplotterKplex.py:181 +msgid "" +"GUI kplex will close. Add manual settings at the end of the configuration " +"file. Open GUI kplex again and restart multiplexer to apply changes." msgstr "" -#: openplotterKplex.py:202 openplotterKplex.py:204 -msgid "Filtering" +#: openplotterKplex.py:185 +msgid "Editor mousepad not found" msgstr "" -#: openplotterKplex.py:203 -msgid "outFilter" +#: openplotterKplex.py:191 +msgid "Closing Kplex" msgstr "" -#: openplotterKplex.py:212 -msgid "Add" +#: openplotterKplex.py:207 +msgid "Kplex restarted" msgstr "" -#: openplotterKplex.py:214 -msgid "Edit" +#: openplotterKplex.py:224 +msgid "You can only edit filter." msgstr "" -#: openplotterKplex.py:216 -msgid "Diagnostic" +#: openplotterKplex.py:315 +msgid "" +"Multiplexer configuration file does not exist. Add inputs and apply changes." msgstr "" -#: openplotterKplex.py:218 -msgid "Remove" +#: openplotterKplex.py:434 openplotterKplex.py:451 +msgid "Select an item." msgstr "" -#: openplotterKplex.py:235 -msgid "You can only edit filter." +#: openplotterKplex.py:496 +msgid "No device selected" msgstr "" -#: openplotterKplex.py:326 -msgid "" -"Multiplexer configuration file does not exist. Add inputs and apply changes." +#: openplotterKplex.py:509 +msgid "Restarting Signal K server... " msgstr "" -#: openplotterKplex.py:425 openplotterKplex.py:436 -msgid "Select an item." +#: openplotterKplex.py:515 +msgid "Signal K server restarted" msgstr "" #: startup.py:40 diff --git a/openplotterKplex/openplotterKplex.py b/openplotterKplex/openplotterKplex.py index 8fc161b..3ac0b00 100644 --- a/openplotterKplex/openplotterKplex.py +++ b/openplotterKplex/openplotterKplex.py @@ -49,7 +49,7 @@ def __init__(self): if os.path.dirname(os.path.abspath(__file__))[0:4] == '/usr': v = version else: v = version.version - wx.Frame.__init__(self, None, title=_('Kplex (NMEA 0183 multiplexer) Graphical user interface')+' '+v, size=(800,444)) + wx.Frame.__init__(self, None, title='Kplex '+v, size=(800,444)) self.SetFont(wx.Font(10, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)) icon = wx.Icon(self.currentdir+"/data/kplex.png", wx.BITMAP_TYPE_PNG) self.SetIcon(icon) diff --git a/setup.py b/setup.py index edfa2e8..292e95b 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ setup ( name = 'openplotterKplex', version = version.version, - description = 'OpenPlotter app to manage serial devices', + description = 'OpenPlotter app to manage NMEA 0183 data', license = 'GPLv3', author="e-sailing", author_email='e.minus.sailing@gmail.com', From ae7945f673554f532d8faa9593d5e69f8ad58dc8 Mon Sep 17 00:00:00 2001 From: Sailoog Date: Sat, 29 Feb 2020 19:31:08 +0100 Subject: [PATCH 2/3] fix dependence --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4f51d13..e96d608 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,6 @@ X-Python3-Version: >= 3.2 Package: openplotter-kplex Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, gpsd, gpsd-clients, kplex +Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings, gpsd, gpsd-clients, kplex Description: OpenPlotter app to manage NMEA 0183 data OpenPlotter app to manage NMEA 0183 data From 8da11179541fc5cb0ee394a00fc63b7c3e9b4b02 Mon Sep 17 00:00:00 2001 From: Sailoog Date: Sat, 29 Feb 2020 19:39:10 +0100 Subject: [PATCH 3/3] update languages source --- .../en/LC_MESSAGES/openplotter-kplex.mo | Bin 468 -> 468 bytes .../en/LC_MESSAGES/openplotter-kplex.po | 216 +++++++++--------- 2 files changed, 112 insertions(+), 104 deletions(-) diff --git a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.mo index f4c8755c06463611e4deed791bffc34bc65e5188..e9aa8f3834b2500a910ca2110ff972b8aaa0c2b8 100644 GIT binary patch delta 23 bcmcb@e1&;J9gC%vvBktD6)?SVl@=oaUK$5J delta 23 bcmcb@e1&;J9gBsPsrkev6)?SVl@=oaUKj^H diff --git a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po index 5bd6a05..704a319 100644 --- a/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po +++ b/openplotterKplex/locale/en/LC_MESSAGES/openplotter-kplex.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: openplotter-kplex\n" -"POT-Creation-Date: 2020-02-29 18:57+0100\n" -"PO-Revision-Date: 2020-02-29 18:57+0100\n" +"POT-Creation-Date: 2020-02-29 19:38+0100\n" +"PO-Revision-Date: 2020-02-29 19:38+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" @@ -23,11 +23,11 @@ msgstr "" msgid " settings " msgstr "" -#: add_kplex.py:41 diagnostic-NMEA.py:57 openplotterKplex.py:128 +#: add_kplex.py:41 diagnostic-NMEA.py:57 openplotterKplex.py:197 msgid "Type" msgstr "" -#: add_kplex.py:50 openplotterKplex.py:127 +#: add_kplex.py:50 openplotterKplex.py:196 msgid "Name" msgstr "" @@ -47,146 +47,146 @@ msgstr "" msgid "Address" msgstr "" -#: add_kplex.py:137 +#: add_kplex.py:136 msgid "in Filter " msgstr "" -#: add_kplex.py:139 add_kplex.py:182 add_kplex.py:299 add_kplex.py:307 -#: add_kplex.py:387 add_kplex.py:534 add_kplex.py:558 add_kplex.py:629 -#: add_kplex.py:633 add_kplex.py:637 add_kplex.py:660 openplotterKplex.py:335 -#: openplotterKplex.py:347 openplotterKplex.py:413 openplotterKplex.py:415 +#: add_kplex.py:138 add_kplex.py:179 add_kplex.py:296 add_kplex.py:304 +#: add_kplex.py:384 add_kplex.py:527 add_kplex.py:551 add_kplex.py:622 +#: add_kplex.py:626 add_kplex.py:630 add_kplex.py:653 openplotterKplex.py:346 +#: openplotterKplex.py:358 openplotterKplex.py:404 openplotterKplex.py:406 msgid "none" msgstr "" -#: add_kplex.py:139 add_kplex.py:182 add_kplex.py:640 add_kplex.py:663 +#: add_kplex.py:138 add_kplex.py:179 add_kplex.py:633 add_kplex.py:656 msgid "Accept only sentences:" msgstr "" -#: add_kplex.py:139 add_kplex.py:182 add_kplex.py:650 add_kplex.py:674 +#: add_kplex.py:138 add_kplex.py:179 add_kplex.py:643 add_kplex.py:667 msgid "Ignore sentences:" msgstr "" -#: add_kplex.py:144 add_kplex.py:186 +#: add_kplex.py:143 add_kplex.py:183 msgid "-" msgstr "" -#: add_kplex.py:163 add_kplex.py:205 +#: add_kplex.py:160 add_kplex.py:202 msgid "Add sentence" msgstr "" -#: add_kplex.py:166 add_kplex.py:207 +#: add_kplex.py:163 add_kplex.py:204 msgid "Delete" msgstr "" -#: add_kplex.py:180 +#: add_kplex.py:177 msgid "out Filter " msgstr "" -#: add_kplex.py:221 add_kplex.py:225 add_kplex.py:326 add_kplex.py:328 -#: add_kplex.py:340 add_kplex.py:342 add_kplex.py:353 add_kplex.py:355 -#: add_kplex.py:382 add_kplex.py:384 add_kplex.py:403 add_kplex.py:406 -#: add_kplex.py:429 add_kplex.py:455 add_kplex.py:533 add_kplex.py:557 -#: add_kplex.py:629 add_kplex.py:633 add_kplex.py:638 add_kplex.py:640 -#: add_kplex.py:651 add_kplex.py:661 add_kplex.py:664 add_kplex.py:675 -#: openplotterKplex.py:339 openplotterKplex.py:351 openplotterKplex.py:413 -#: openplotterKplex.py:415 +#: add_kplex.py:218 add_kplex.py:222 add_kplex.py:323 add_kplex.py:325 +#: add_kplex.py:337 add_kplex.py:339 add_kplex.py:350 add_kplex.py:352 +#: add_kplex.py:379 add_kplex.py:381 add_kplex.py:400 add_kplex.py:403 +#: add_kplex.py:424 add_kplex.py:450 add_kplex.py:526 add_kplex.py:550 +#: add_kplex.py:622 add_kplex.py:626 add_kplex.py:631 add_kplex.py:633 +#: add_kplex.py:644 add_kplex.py:654 add_kplex.py:657 add_kplex.py:668 +#: openplotterKplex.py:350 openplotterKplex.py:362 openplotterKplex.py:404 +#: openplotterKplex.py:406 msgid "nothing" msgstr "" -#: add_kplex.py:229 +#: add_kplex.py:226 msgid "getSK examp" msgstr "" -#: add_kplex.py:232 +#: add_kplex.py:229 msgid "putSK examp" msgstr "" -#: add_kplex.py:235 +#: add_kplex.py:232 msgid "AP examp" msgstr "" -#: add_kplex.py:238 +#: add_kplex.py:235 msgid "GPS examp" msgstr "" -#: add_kplex.py:241 +#: add_kplex.py:238 msgid "gpsd examp" msgstr "" -#: add_kplex.py:244 +#: add_kplex.py:241 msgid "OK" msgstr "" -#: add_kplex.py:300 add_kplex.py:308 openplotterKplex.py:336 -#: openplotterKplex.py:348 +#: add_kplex.py:297 add_kplex.py:305 openplotterKplex.py:347 +#: openplotterKplex.py:359 msgid "accept" msgstr "" -#: add_kplex.py:302 add_kplex.py:310 openplotterKplex.py:337 -#: openplotterKplex.py:349 +#: add_kplex.py:299 add_kplex.py:307 openplotterKplex.py:348 +#: openplotterKplex.py:360 msgid "ignore" msgstr "" -#: add_kplex.py:413 add_kplex.py:439 +#: add_kplex.py:410 add_kplex.py:434 msgid "" "Talker must have 2 uppercase characters. The symbol * matches any character." msgstr "" -#: add_kplex.py:416 add_kplex.py:442 +#: add_kplex.py:413 add_kplex.py:437 msgid "" "Sentence must have 3 uppercase characters. The symbol * matches any " "character." msgstr "" -#: add_kplex.py:424 add_kplex.py:450 +#: add_kplex.py:419 add_kplex.py:445 msgid "" "You must enter 2 uppercase characters for talker or 3 uppercase characters " "for sentence. The symbol * matches any character." msgstr "" -#: add_kplex.py:427 add_kplex.py:453 +#: add_kplex.py:422 add_kplex.py:448 msgid "This sentence already exists." msgstr "" -#: add_kplex.py:580 +#: add_kplex.py:573 msgid "" "\"Name\" must be a string between 1 and 13 lowercase letters and/or numbers " "which is not used as name for another input/output." msgstr "" -#: add_kplex.py:585 +#: add_kplex.py:578 msgid "This name is already in use." msgstr "" -#: add_kplex.py:589 +#: add_kplex.py:582 msgid "This name is reserved by the system." msgstr "" -#: add_kplex.py:596 +#: add_kplex.py:589 msgid "You must select a Port." msgstr "" -#: add_kplex.py:601 +#: add_kplex.py:594 msgid "This output is already in use." msgstr "" -#: add_kplex.py:610 +#: add_kplex.py:603 msgid "You must enter an Address." msgstr "" -#: add_kplex.py:615 +#: add_kplex.py:608 msgid "You must enter a Port." msgstr "" -#: add_kplex.py:619 +#: add_kplex.py:612 msgid "Cancelled. Port 10111-10113 are reserved." msgstr "" -#: add_kplex.py:626 +#: add_kplex.py:619 msgid "This input is already in use." msgstr "" -#: add_kplex.py:630 add_kplex.py:634 +#: add_kplex.py:623 add_kplex.py:627 msgid "You must select a Filter type." msgstr "" @@ -234,17 +234,17 @@ msgstr "" msgid "Adding kplex service..." msgstr "" -#: kplexPostInstall.py:34 kplexPostInstall.py:40 kplexPreUninstall.py:34 +#: kplexPostInstall.py:50 kplexPostInstall.py:56 kplexPreUninstall.py:34 #: kplexPreUninstall.py:40 msgid "DONE" msgstr "" -#: kplexPostInstall.py:35 kplexPostInstall.py:41 kplexPreUninstall.py:35 +#: kplexPostInstall.py:51 kplexPostInstall.py:57 kplexPreUninstall.py:35 #: kplexPreUninstall.py:41 msgid "FAILED: " msgstr "" -#: kplexPostInstall.py:37 +#: kplexPostInstall.py:53 msgid "Setting version..." msgstr "" @@ -256,115 +256,123 @@ msgstr "" msgid "Removing version..." msgstr "" -#: openplotterKplex.py:61 +#: openplotterKplex.py:62 msgid "Help" msgstr "" -#: openplotterKplex.py:64 +#: openplotterKplex.py:65 msgid "Settings" msgstr "" -#: openplotterKplex.py:67 -msgid "Refresh" +#: openplotterKplex.py:68 +msgid "SK Connection" +msgstr "" + +#: openplotterKplex.py:70 +msgid "OP Serial" msgstr "" #: openplotterKplex.py:73 -msgid "Devices" +msgid "restart" msgstr "" -#: openplotterKplex.py:129 -msgid "io" +#: openplotterKplex.py:75 +msgid "manual settings" msgstr "" -#: openplotterKplex.py:130 -msgid "Port/Address" +#: openplotterKplex.py:78 +msgid "Apply changes" msgstr "" -#: openplotterKplex.py:131 -msgid "Bauds/Port" +#: openplotterKplex.py:85 +msgid "Devices" msgstr "" -#: openplotterKplex.py:132 -msgid "inFilter" +#: openplotterKplex.py:142 +msgid "Closing Kplex" msgstr "" -#: openplotterKplex.py:133 openplotterKplex.py:135 -msgid "Filtering" +#: openplotterKplex.py:156 +msgid "Kplex running" msgstr "" -#: openplotterKplex.py:134 -msgid "outFilter" +#: openplotterKplex.py:164 +msgid "Error: Can't restart Kplex" msgstr "" -#: openplotterKplex.py:138 -msgid "Diagnostic" +#: openplotterKplex.py:166 +msgid "Kplex restarted" msgstr "" -#: openplotterKplex.py:141 -msgid "add network" +#: openplotterKplex.py:175 +msgid "Please install \"Signal K Installer\" OpenPlotter app" msgstr "" -#: openplotterKplex.py:143 -msgid "delete" +#: openplotterKplex.py:183 +msgid "Please install \"Serial\" OpenPlotter app" msgstr "" -#: openplotterKplex.py:146 -msgid "Restart" +#: openplotterKplex.py:188 +msgid "" +"Add manual settings at the end of the configuration file. Restart to apply " +"changes." msgstr "" -#: openplotterKplex.py:148 -msgid "Advanced" +#: openplotterKplex.py:192 +msgid "Editor mousepad not found" msgstr "" -#: openplotterKplex.py:150 -msgid "Apply changes" +#: openplotterKplex.py:198 +msgid "io" msgstr "" -#: openplotterKplex.py:152 -msgid "Cancel changes" +#: openplotterKplex.py:199 +msgid "Port/Address" msgstr "" -#: openplotterKplex.py:181 -msgid "" -"GUI kplex will close. Add manual settings at the end of the configuration " -"file. Open GUI kplex again and restart multiplexer to apply changes." +#: openplotterKplex.py:200 +msgid "Bauds/Port" msgstr "" -#: openplotterKplex.py:185 -msgid "Editor mousepad not found" +#: openplotterKplex.py:201 +msgid "inFilter" msgstr "" -#: openplotterKplex.py:191 -msgid "Closing Kplex" +#: openplotterKplex.py:202 openplotterKplex.py:204 +msgid "Filtering" msgstr "" -#: openplotterKplex.py:207 -msgid "Kplex restarted" +#: openplotterKplex.py:203 +msgid "outFilter" msgstr "" -#: openplotterKplex.py:224 -msgid "You can only edit filter." +#: openplotterKplex.py:212 +msgid "Add" msgstr "" -#: openplotterKplex.py:315 -msgid "" -"Multiplexer configuration file does not exist. Add inputs and apply changes." +#: openplotterKplex.py:214 +msgid "Edit" msgstr "" -#: openplotterKplex.py:434 openplotterKplex.py:451 -msgid "Select an item." +#: openplotterKplex.py:216 +msgid "Diagnostic" msgstr "" -#: openplotterKplex.py:496 -msgid "No device selected" +#: openplotterKplex.py:218 +msgid "Remove" msgstr "" -#: openplotterKplex.py:509 -msgid "Restarting Signal K server... " +#: openplotterKplex.py:235 +msgid "You can only edit filter." +msgstr "" + +#: openplotterKplex.py:326 +msgid "" +"Multiplexer configuration file does not exist. Add inputs and apply changes." msgstr "" -#: openplotterKplex.py:515 -msgid "Signal K server restarted" +#: openplotterKplex.py:425 openplotterKplex.py:436 +msgid "Select an item." msgstr "" #: startup.py:40