Merge branch 'release-2.4.0' of bitbucket.org:k1jt/wsjtx into release-2.4.0

This commit is contained in:
Joe Taylor 2021-02-06 13:07:45 -05:00
commit dbb8a1c9ad
2 changed files with 82 additions and 32 deletions

View File

@ -2226,7 +2226,17 @@ Error(%2): %3</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="1297"/> <location filename="../widgets/mainwindow.ui" line="1143"/>
<source>Decode other Hounds calling above 1000 Hz audio offset</source>
<translation> 1000 Hz </translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1192"/>
<source>Enable auto response to the first decode from a new DXCC or new call on the current band.</source>
<translation>DXCC或新呼叫的第一个解码的自动响应.</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1605"/>
<source>F High </source> <source>F High </source>
<translation>F </translation> <translation>F </translation>
</message> </message>
@ -2351,7 +2361,12 @@ Error(%2): %3</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>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3390"/> <location filename="../widgets/mainwindow.ui" line="3376"/>
<source>Q65</source>
<translation></translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="3384"/>
<source>SWL Mode</source> <source>SWL Mode</source>
<translation>SWL模式</translation> <translation>SWL模式</translation>
</message> </message>
@ -3431,12 +3446,7 @@ list. The list can be maintained in Settings (F2).</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3096"/> <location filename="../widgets/mainwindow.ui" line="3090"/>
<source>JT9+JT65</source>
<translation></translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="3104"/>
<source>Astronomical data</source> <source>Astronomical data</source>
<translation></translation> <translation></translation>
</message> </message>
@ -3647,7 +3657,17 @@ list. The list can be maintained in Settings (F2).</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="253"/> <location filename="../widgets/mainwindow.ui" line="3392"/>
<source>Quick-Start Guide to Q65</source>
<translation>Q65 </translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="3400"/>
<source>Auto Clear Avg after decode</source>
<translation></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="258"/>
<source>Rig Control Error</source> <source>Rig Control Error</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
@ -3885,16 +3905,16 @@ list. The list can be maintained in Settings (F2).</source>
<translation>&quot;fmt.all&quot; &quot;fmt.bak&quot;</translation> <translation>&quot;fmt.all&quot; &quot;fmt.bak&quot;</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="2571"/> <location filename="../widgets/mainwindow.cpp" line="2599"/>
<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: <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-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> &quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, 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>
<translation> GNU 使 WSJT-X , : <translation>GNU通用公共许可证的条款合理使用WSJT-X的任何部分, :
&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> &quot;WSJT-X和相关程序的算法, FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, 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>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="2846"/> <location filename="../widgets/mainwindow.cpp" line="2889"/>
<source>No data read from disk. Wrong file format?</source> <source>No data read from disk. Wrong file format?</source>
<translation>. ?</translation> <translation>. ?</translation>
</message> </message>
@ -4953,7 +4973,12 @@ Error(%2): %3</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/widegraph.ui" line="343"/> <location filename="../widgets/widegraph.ui" line="340"/>
<source>Q65_Sync</source>
<translation>Q65_同步</translation>
</message>
<message>
<location filename="../widgets/widegraph.ui" line="348"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Frequency at left edge of waterfall&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Frequency at left edge of waterfall&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>
@ -5003,7 +5028,7 @@ Error(%2): %3</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/widegraph.cpp" line="33"/> <location filename="../widgets/widegraph.cpp" line="28"/>
<source>Wide Graph</source> <source>Wide Graph</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -2226,7 +2226,17 @@ Error(%2): %3</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="1297"/> <location filename="../widgets/mainwindow.ui" line="1143"/>
<source>Decode other Hounds calling above 1000 Hz audio offset</source>
<translation>調 1000 Hz </translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1192"/>
<source>Enable auto response to the first decode from a new DXCC or new call on the current band.</source>
<translation> DXCC .</translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1605"/>
<source>F High </source> <source>F High </source>
<translation>F </translation> <translation>F </translation>
</message> </message>
@ -2351,7 +2361,12 @@ Error(%2): %3</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>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3390"/> <location filename="../widgets/mainwindow.ui" line="3376"/>
<source>Q65</source>
<translation></translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="3384"/>
<source>SWL Mode</source> <source>SWL Mode</source>
<translation>SWL </translation> <translation>SWL </translation>
</message> </message>
@ -3431,12 +3446,7 @@ list. The list can be maintained in Settings (F2).</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.ui" line="3096"/> <location filename="../widgets/mainwindow.ui" line="3090"/>
<source>JT9+JT65</source>
<translation></translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="3104"/>
<source>Astronomical data</source> <source>Astronomical data</source>
<translation></translation> <translation></translation>
</message> </message>
@ -3647,7 +3657,17 @@ list. The list can be maintained in Settings (F2).</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="253"/> <location filename="../widgets/mainwindow.ui" line="3392"/>
<source>Quick-Start Guide to Q65</source>
<translation>Q65 </translation>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="3400"/>
<source>Auto Clear Avg after decode</source>
<translation></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="258"/>
<source>Rig Control Error</source> <source>Rig Control Error</source>
<translation></translation> <translation></translation>
</message> </message>
@ -3885,16 +3905,16 @@ list. The list can be maintained in Settings (F2).</source>
<translation>&quot;fmt.all&quot; &quot;fmt.bak&quot;</translation> <translation>&quot;fmt.all&quot; &quot;fmt.bak&quot;</translation>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="2551"/> <location filename="../widgets/mainwindow.cpp" line="2599"/>
<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: <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-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> &quot;The algorithms, source code, look-and-feel of WSJT-X and related programs, and protocol specifications for the modes FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, 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>
<translation> GNU 使 WSJT-X , : <translation> GNU 使 WSJT-X , :
&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> &quot;WSJT-X FSK441, FST4, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, 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>
</message> </message>
<message> <message>
<location filename="../widgets/mainwindow.cpp" line="2846"/> <location filename="../widgets/mainwindow.cpp" line="2889"/>
<source>No data read from disk. Wrong file format?</source> <source>No data read from disk. Wrong file format?</source>
<translation>. ?</translation> <translation>. ?</translation>
</message> </message>
@ -4954,7 +4974,12 @@ Error(%2): %3</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/widegraph.ui" line="343"/> <location filename="../widgets/widegraph.ui" line="340"/>
<source>Q65_Sync</source>
<translation>Q65_同步</translation>
</message>
<message>
<location filename="../widgets/widegraph.ui" line="348"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Frequency at left edge of waterfall&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Frequency at left edge of waterfall&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>
@ -5004,7 +5029,7 @@ Error(%2): %3</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/widegraph.cpp" line="33"/> <location filename="../widgets/widegraph.cpp" line="28"/>
<source>Wide Graph</source> <source>Wide Graph</source>
<translation></translation> <translation></translation>
</message> </message>