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 'hotfix-2.2.2' into develop

This commit is contained in:
Bill Somerville 2020-06-21 21:44:59 +01:00
parent 398414a811 8458df1137
commit c2de0fe7ca
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
7 changed files with 550 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configuration.cpp
View File

@ -230,7 +230,7 @@ namespace
|IL|IN|KS|KY|LA|LAX|MAR|MB|MDC
|ME|MI|MN|MO|MS|MT|NC|ND|NE|NFL
|NH|NL|NLI|NM|NNJ|NNY|NT|NTX|NV
|OH|OK|ONE|ONN|ONS|OR|ORG|PAC
|OH|OK|ONE|ONN|ONS|OR|ORG|PAC|PE
|PR|QC|RI|SB|SC|SCV|SD|SDG|SF
|SFL|SJV|SK|SNJ|STX|SV|TN|UT|VA
|VI|VT|WCF|WI|WMA|WNY|WPA|WTX

8
lib/77bit/packjt77.f90
View File

@ -196,7 +196,7 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
! the value of nrx is used to decide when mycall13 or dxcall13 should
! be used in place of a callsign from the hashtable
!
parameter (NSEC=84) !Number of ARRL Sections
parameter (NSEC=85) !Number of ARRL Sections
parameter (NUSCAN=65) !Number of US states and Canadian provinces
parameter (MAXGRID4=32400)
integer*8 n58
@ -228,7 +228,7 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
"ONS","OR ","ORG","PAC","PR ","QC ","RI ","SB ","SC ","SCV", &
"SD ","SDG","SF ","SFL","SJV","SK ","SNJ","STX","SV ","TN ", &
"UT ","VA ","VI ","VT ","WCF","WI ","WMA","WNY","WPA","WTX", &
"WV ","WWA","WY ","DX "/
"WV ","WWA","WY ","DX ","PE "/
data cmult/ &
"AL ","AK ","AZ ","AR ","CA ","CO ","CT ","DE ","FL ","GA ", &
"HI ","ID ","IL ","IN ","IA ","KS ","KY ","LA ","ME ","MD ", &
@ -864,7 +864,7 @@ subroutine pack77_03(nwords,w,i3,n3,c77)
! Check 0.3 and 0.4 (ARRL Field Day exchange)
! Example message: WA9XYZ KA1ABC R 16A EMA 28 28 1 4 3 7 71
parameter (NSEC=84) !Number of ARRL Sections
parameter (NSEC=85) !Number of ARRL Sections
character*13 w(19)
character*77 c77
character*6 bcall_1,bcall_2
@ -879,7 +879,7 @@ subroutine pack77_03(nwords,w,i3,n3,c77)
"ONS","OR ","ORG","PAC","PR ","QC ","RI ","SB ","SC ","SCV", &
"SD ","SDG","SF ","SFL","SJV","SK ","SNJ","STX","SV ","TN ", &
"UT ","VA ","VI ","VT ","WCF","WI ","WMA","WNY","WPA","WTX", &
"WV ","WWA","WY ","DX "/
"WV ","WWA","WY ","DX ","PE "/
if(nwords.lt.4 .or. nwords.gt.5) return
call chkcall(w(1),bcall_1,ok1)

494
translations/wsjtx_ca.ts
View File

File diff suppressed because it is too large Load Diff

494
translations/wsjtx_es.ts
View File

File diff suppressed because it is too large Load Diff

10
translations/wsjtx_ja.ts
View File

@ -888,6 +888,16 @@ Format:
</context>
<context>
<name>Directory</name>
<message>
<location filename="../SampleDownloader/Directory.cpp" line="51"/>
<source>File</source>
<translation type="unfinished">ファイル</translation>
</message>
<message>
<location filename="../SampleDownloader/Directory.cpp" line="51"/>
<source>Progress</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../SampleDownloader/Directory.cpp" line="113"/>
<location filename="../SampleDownloader/Directory.cpp" line="189"/>

3
translations/wsjtx_zh.ts
View File

@ -4173,9 +4173,8 @@ UDP 服务器 %2:%3</translation>
<context>
<name>QObject</name>
<message>
<location filename="../main.cpp" line="340"/>
<source>Invalid rig name - \ &amp; / not allowed</source>
<translation>无效的无线电设备名称 - \ &amp; / 不允许</translation>
<translation type="vanished">无效的无线电设备名称 - \ &amp; / 不允许</translation>
</message>
<message>
<location filename="../widgets/widegraph.cpp" line="18"/>

1
translations/wsjtx_zh_HK.ts
View File

@ -4173,7 +4173,6 @@ UDP 服務器 %2:%3</translation>
<context>
<name>QObject</name>
<message>
<location filename="../main.cpp" line="340"/>
<source>Invalid rig name - \ &amp; / not allowed</source>
<translation>無效的無線電裝置名稱 - \ &amp; / 不允許</translation>
</message>