From ac032600449a7fa05eaba3626866e90acba544c2 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 29 Dec 2019 12:11:36 +0000 Subject: [PATCH 1/4] Withhold plots directory tree from source tarball Thanks to Christoph, DF7CB, who pointed out that we package a redundant version of the QCustomPlot widget sources. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index b1e1bbf70..2712bf16d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ /lib/fsk4hf export-ignore /lib/fsk4hf export-ignore /robots export-ignore +/plots export-ignore From 5e3781e9e97e1d8cdc669cad6c8901012e29ef26 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 29 Dec 2019 12:25:59 +0000 Subject: [PATCH 2/4] Correct some UI text typos Thanks to Christoph, DF7CB, for providing a patch for these typos. --- Configuration.ui | 6 +++--- widgets/mainwindow.ui | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Configuration.ui b/Configuration.ui index 53091a905..e86fe984a 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -951,7 +951,7 @@ a few, particularly some Kenwood rigs, require it). - <html><head/><body><p>Use the RS-232 DTR control line to toggle your radio's PTT, requires hardware to inteface the line.</p><p>Some commercial interface units also use this method.</p><p>The DTR control line of the CAT serial port may be used for this or a DTR control line on a different serial port may be used.</p></body></html> + <html><head/><body><p>Use the RS-232 DTR control line to toggle your radio's PTT, requires hardware to interface the line.</p><p>Some commercial interface units also use this method.</p><p>The DTR control line of the CAT serial port may be used for this or a DTR control line on a different serial port may be used.</p></body></html> &DTR @@ -982,7 +982,7 @@ other hardware interface for PTT. - <html><head/><body><p>Use the RS-232 RTS control line to toggle your radio's PTT, requires hardware to inteface the line.</p><p>Some commercial interface units also use this method.</p><p>The RTS control line of the CAT serial port may be used for this or a RTS control line on a different serial port may be used. Note that this option is not available on the CAT serial port when hardware flow control is used.</p></body></html> + <html><head/><body><p>Use the RS-232 RTS control line to toggle your radio's PTT, requires hardware to interface the line.</p><p>Some commercial interface units also use this method.</p><p>The RTS control line of the CAT serial port may be used for this or a RTS control line on a different serial port may be used. Note that this option is not available on the CAT serial port when hardware flow control is used.</p></body></html> R&TS @@ -1080,7 +1080,7 @@ or bandwidth is selected). - If this is availabe then it is usually the correct mode for this program. + If this is available then it is usually the correct mode for this program. Data/P&kt diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index c37da3885..59fbd7f7d 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -1,3 +1,4 @@ + MainWindow @@ -981,7 +982,7 @@ QPushButton[state="ok"] { <html><head/><body><p>Select operating band or enter frequency in MHz or enter kHz increment followed by k.</p></body></html> - Frequncy entry + Frequency entry Select operating band or enter frequency in MHz or enter kHz increment followed by k. @@ -2635,10 +2636,10 @@ list. The list can be maintained in Settings (F2). - <html><head/><body><p>6 digit locators cause 2 different mesages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.</p></body></html> + <html><head/><body><p>6 digit locators cause 2 different messages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.</p></body></html> - 6 digit locators cause 2 different mesages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol. + 6 digit locators cause 2 different messages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol. Prefer type 1 messages From 75c9e1d696f185627f66f92d91fb078feac03756 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 29 Dec 2019 12:34:02 +0000 Subject: [PATCH 3/4] Fix a patching error --- widgets/mainwindow.ui | 1 - 1 file changed, 1 deletion(-) diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index 59fbd7f7d..288ce9a57 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -1,5 +1,4 @@ - MainWindow From 3c4825a5e77dbd24c4601736a7344656c558b867 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 29 Dec 2019 12:40:47 +0000 Subject: [PATCH 4/4] Fix typos carried through to language files --- translations/wsjtx_en_GB.ts | 6 +++--- translations/wsjtx_pt_PT.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/translations/wsjtx_en_GB.ts b/translations/wsjtx_en_GB.ts index 2e0570962..261d4486d 100644 --- a/translations/wsjtx_en_GB.ts +++ b/translations/wsjtx_en_GB.ts @@ -2066,7 +2066,7 @@ Yellow when too low - Frequncy entry + Frequency entry @@ -2894,12 +2894,12 @@ list. The list can be maintained in Settings (F2). - <html><head/><body><p>6 digit locators cause 2 different mesages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.</p></body></html> + <html><head/><body><p>6 digit locators cause 2 different messages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.</p></body></html> - 6 digit locators cause 2 different mesages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol. + 6 digit locators cause 2 different messages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol. diff --git a/translations/wsjtx_pt_PT.ts b/translations/wsjtx_pt_PT.ts index 6167f5d8d..3aae238db 100644 --- a/translations/wsjtx_pt_PT.ts +++ b/translations/wsjtx_pt_PT.ts @@ -2066,7 +2066,7 @@ Yellow when too low - Frequncy entry + Frequency entry @@ -2894,12 +2894,12 @@ list. The list can be maintained in Settings (F2). - <html><head/><body><p>6 digit locators cause 2 different mesages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.</p></body></html> + <html><head/><body><p>6 digit locators cause 2 different messages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.</p></body></html> - 6 digit locators cause 2 different mesages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol. + 6 digit locators cause 2 different messages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.