w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Bill Somerville 2021-10-25 16:48:17 +01:00
parent e9e1688ad8 c56926595a
commit 677971ae38
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/user_guide/en/acknowledgements.adoc
View File

@ -5,7 +5,7 @@ been an Open Source project, which now includes the programs _WSJT_,
_MAP65_, _WSPR_, _WSJT-X_, and _WSPR-X_. *G4WJS* (since 2013), *K9AN*
(since 2015), and *IV3NWV* (since 2016) have made major contributions
to _WSJT-X_. Together with K1JT they now form the core development
team. *G4WJS* and *W9MDB* have made major contributiions to _hamlib_,
team. *G4WJS* and *W9MDB* have made major contributions to _hamlib_,
on which _WSJT-X_ depends for rig control.
All code in the _WSJT_ project is licensed under the GNU Public

2
doc/user_guide/en/intro_subsections.adoc
View File

@ -25,7 +25,7 @@ consequences.
The _WSJT-X_ user interface (UI) is now available in many languages.
When a translated UI is available for the computer's default System
Language, it will appear automatically on program startup. The UI
language may be overriden if desired by starting _WSJT-X_ with a
language may be overridden if desired by starting _WSJT-X_ with a
command line option.
=== How You Can Contribute

2
doc/user_guide/en/tutorial-example5.adoc
View File

@ -31,7 +31,7 @@ image::FST4_center.png[align="center"]
It's best to keep the decoding range fairly small, since QRM and
transmissions in other modes or sequence lengths will slow down the
decoding process (and of course will be undecodable). By checking
*Single decode* on the the *File | Settings | General* tab, you can
*Single decode* on the *File | Settings | General* tab, you can
further limit the decoding range to the setting of *F Tol* on
either side of *Rx Freq*.

6
lib/qra/q65/q65_set_list.f90
View File

@ -22,12 +22,8 @@ subroutine q65_set_list(mycall,hiscall,hisgrid,codewords,ncw)
if(i.eq.1 .or. i.ge.6) msg='<'//trim(mycall)//'> '//trim(hiscall)
if(i.ge.2 .and. i.le.4) msg=trim(mycall)//' <'//trim(hiscall)//'>'
else if(.not.his_std) then
if(i.le.4) msg='<'//trim(mycall)//'> '//trim(hiscall)
if(i.le.4 .or. i.eq.6) msg='<'//trim(mycall)//'> '//trim(hiscall)
if(i.ge.7) msg=trim(mycall)//' <'//trim(hiscall)//'>'
if(i.eq.6) then
msg='TNX 73 GL'
go to 10
endif
endif
j0=len(trim(msg))+2
if(i.eq.2) msg(j0:j0+2)='RRR'