Merge branch 'release-2.3.0' into develop

This commit is contained in:
Bill Somerville 2021-01-07 11:38:08 +00:00
commit 9cd6edbeca
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
10 changed files with 6335 additions and 5989 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2108,7 +2108,7 @@ Error(%2): %3</source>
<message>
<location filename="../widgets/mainwindow.ui" line="376"/>
<source>Enter this QSO in log</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="379"/>
@ -2464,7 +2464,7 @@ Yellow when too low</source>
<message>
<location filename="../widgets/mainwindow.ui" line="679"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select operating band or enter frequency in MHz or enter kHz increment followed by k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; MHz kHz k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="682"/>
@ -2653,7 +2653,7 @@ Yellow when too low</source>
<message>
<location filename="../widgets/mainwindow.ui" line="1481"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Frequency to call CQ on in kHz above the current MHz&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; CQ kHz MHz&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; CQ &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1484"/>
@ -3888,10 +3888,10 @@ list. The list can be maintained in Settings (F2).</source>
<location filename="../widgets/mainwindow.cpp" line="2571"/>
<source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work:
&quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 are Copyright (C) 2001-2021 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source>
&quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 are Copyright (C) 2001-2020 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source>
<translation> GNU 使 WSJT-X , :
&quot;WSJT-X , , , FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 (C) 2001-2021 由以下一个或多个作者: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; WSJT .&quot;</translation>
&quot;WSJT-X , , , FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 (C) 2001-2019 由以下一个或多个作者: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; WSJT .&quot;</translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2846"/>
@ -6040,7 +6040,7 @@ and DX Grid fields when a 73 or free text message is sent.</source>
<message>
<location filename="../Configuration.ui" line="1791"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The callsign of the operator, if different from the station callsign.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; ().&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;, .&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../Configuration.ui" line="1798"/>
@ -6060,7 +6060,7 @@ and DX Grid fields when a 73 or free text message is sent.</source>
<message>
<location filename="../Configuration.ui" line="1824"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The program can send your station details and all decoded signals with grid squares as spots to the http://pskreporter.info web site.&lt;/p&gt;&lt;p&gt;This is used for reverse beacon analysis which is very useful for assessing propagation and system performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;http://pskreporter.info网站.&lt;/p&gt;&lt;p&gt;这用于反向信标分析这对于评估传播和系统性能非常有用.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;http://pskreporter.info网站.&lt;/p&gt;&lt;p&gt;这用于反向信标分析, 这对于评估传播和系统性能非常有用.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../Configuration.ui" line="1827"/>
@ -6226,7 +6226,7 @@ and DX Grid fields when a 73 or free text message is sent.</source>
<location filename="../Configuration.ui" line="2177"/>
<source>Items may be edited.
Right click for insert and delete options.</source>
<translation>
<translation>.
.</translation>
</message>
<message>

View File

@ -2464,7 +2464,7 @@ Yellow when too low</source>
<message>
<location filename="../widgets/mainwindow.ui" line="679"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select operating band or enter frequency in MHz or enter kHz increment followed by k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; MHz kHz , k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;, k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="682"/>
@ -2474,7 +2474,7 @@ Yellow when too low</source>
<message>
<location filename="../widgets/mainwindow.ui" line="685"/>
<source>Select operating band or enter frequency in MHz or enter kHz increment followed by k.</source>
<translation> MHz kHz , k.</translation>
<translation>, k.</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1060"/>
@ -2653,7 +2653,7 @@ Yellow when too low</source>
<message>
<location filename="../widgets/mainwindow.ui" line="1481"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Frequency to call CQ on in kHz above the current MHz&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;CQ kHz MHz&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;CQ &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1484"/>
@ -2726,14 +2726,14 @@ Not available to nonstandard callsign holders.</source>
<message>
<location filename="../widgets/mainwindow.ui" line="1655"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check this to start recording calibration data.&lt;br/&gt;While measuring calibration correction is disabled.&lt;br/&gt;When not checked you can view the calibration results.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;.&lt;br/&gt;.&lt;br/&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;.&lt;br/&gt;.&lt;br/&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1658"/>
<source>Check this to start recording calibration data.
While measuring calibration correction is disabled.
When not checked you can view the calibration results.</source>
<translation>.
<translation>.
.
.</translation>
</message>
@ -3691,7 +3691,7 @@ list. The list can be maintained in Settings (F2).</source>
<message>
<location filename="../widgets/mainwindow.cpp" line="530"/>
<source>Scanned ADIF log, %1 worked before records created</source>
<translation> ADIF , %1 </translation>
<translation> ADIF , %1 </translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="640"/>
@ -3888,10 +3888,10 @@ list. The list can be maintained in Settings (F2).</source>
<location filename="../widgets/mainwindow.cpp" line="2551"/>
<source>If you make fair use of any part of WSJT-X under terms of the GNU General Public License, you must display the following copyright notice prominently in your derivative work:
&quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 are Copyright (C) 2001-2021 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source>
&quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 are Copyright (C) 2001-2020 by one or more of the following authors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; and other members of the WSJT Development Group.&quot;</source>
<translation> GNU 使 WSJT-X , :
&quot;WSJT-X , , , FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 (C) 2001-2021 由以下一個或多個作者: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; WSJT .&quot;</translation>
&quot;WSJT-X , , , FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 (C) 2001-2019 由以下一個或多個作者: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; WSJT .&quot;</translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2846"/>
@ -4225,7 +4225,7 @@ is already in CALL3.TXT, do you wish to replace it?</source>
<message>
<location filename="../widgets/mainwindow.cpp" line="6762"/>
<source>Doing this will remove all QSO records for the current contest. They will be kept in the ADIF log file but will not be available for export in your Cabrillo log.</source>
<translation>. ADIF , .</translation>
<translation>. ADIF , .</translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6775"/>
@ -6031,12 +6031,12 @@ and DX Grid fields when a 73 or free text message is sent.</source>
<message>
<location filename="../Configuration.ui" line="1781"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Some logging programs will not accept WSJT-X mode names.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; WSJT-X .&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; WSJT-X .&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../Configuration.ui" line="1784"/>
<source>Con&amp;vert mode to RTTY</source>
<translation>&amp;RTTY模式</translation>
<translation>&amp;RTTY模式</translation>
</message>
<message>
<location filename="../Configuration.ui" line="1791"/>
@ -6141,12 +6141,12 @@ and DX Grid fields when a 73 or free text message is sent.</source>
<message>
<location filename="../Configuration.ui" line="1949"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, WSJT-X will broadcast a logged contact in ADIF format to the configured hostname and port. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;, WSJT-X ADIF . &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;, WSJT-X ADIF . &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../Configuration.ui" line="1952"/>
<source>Enable logged contact ADIF broadcast</source>
<translation> ADIF </translation>
<translation> ADIF </translation>
</message>
<message>
<location filename="../Configuration.ui" line="1959"/>

View File

@ -1139,6 +1139,9 @@ Not available to nonstandard callsign holders.</string>
</item>
<item>
<widget class="QCheckBox" name="cbRxAll">
<property name="toolTip">
<string>Decode other Hounds calling above 1000 Hz audio offset</string>
</property>
<property name="text">
<string>Rx All Freqs</string>
</property>