From 5de5db67653f9745c9c615cf5afbd13b667cfd9c Mon Sep 17 00:00:00 2001 From: K9AN Date: Sat, 6 Jun 2020 08:18:31 -0500 Subject: [PATCH 1/3] Override hashtable and use mycall when 22-bit hash in call_1 of i3=1 message matches hashmy22. --- lib/77bit/packjt77.f90 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90 index c5a663ccd..22cdb52fb 100644 --- a/lib/77bit/packjt77.f90 +++ b/lib/77bit/packjt77.f90 @@ -411,6 +411,10 @@ subroutine unpack77(c77,nrx,msg,unpk77_success) read(c77,1000) n28a,ipa,n28b,ipb,ir,igrid4,i3 1000 format(2(b28,b1),b1,b15,b3) call unpack28(n28a,call_1,unpk28_success) + if(nrx.eq.1 .and. mycall13_set .and. hashmy22.eq.(n28a-2063592)) then + call_1='<'//trim(mycall13)//'>' + unpk28_success=.true. + endif if(.not.unpk28_success) unpk77_success=.false. call unpack28(n28b,call_2,unpk28_success) if(.not.unpk28_success) unpk77_success=.false. From 961ecb5b47f2d643584d8ab4bcb01350323fdb14 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 6 Jun 2020 14:55:48 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Updated=20Catalan=20UI=20translation,=20tnx?= =?UTF-8?q?=20Xavi,=20EA3W,=20&=20C=C3=A9dric,=20EA4AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes some Alt key accelerator issues. --- translations/wsjtx_ca.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/translations/wsjtx_ca.ts b/translations/wsjtx_ca.ts index 65955d0c5..4c9f0ef77 100644 --- a/translations/wsjtx_ca.ts +++ b/translations/wsjtx_ca.ts @@ -2074,7 +2074,7 @@ Error(%2): %3 &Halt Tx - &Aturar TX + Aturar &TX @@ -2145,7 +2145,7 @@ en Groc quan és massa baix Search for callsign in database - Buscar l'indicatiu a la base de dades + Buscar el indicatiu a la base de dades @@ -3168,7 +3168,7 @@ La llista es pot mantenir a la configuració (F2). Shift+F6 - Majúscules+F6 + Maj.+F6 @@ -3501,7 +3501,7 @@ La llista es pot mantenir a la configuració (F2). Shift+F1 - Majúscules+F1 + Maj.+F1 @@ -4738,7 +4738,7 @@ Error(%2): %3 M&y Grid: - E&l meu Locator: + El meu L&ocator: @@ -4803,7 +4803,7 @@ Error(%2): %3 &Tx messages to Rx frequency window - &Missatges de TX a la finestra de la freqüència de RX + Missa&tges de TX a la finestra de la freqüència de RX @@ -4858,7 +4858,7 @@ Error(%2): %3 &Blank line between decoding periods - &Línia en blanc entre els períodes de descodificació + Lín&ia en blanc entre els períodes de descodificació @@ -4955,7 +4955,7 @@ missatge de text lliure. Di&sable Tx after sending 73 - De&sactiva TX després d’enviar 73 + Desa&ctiva TX després d’enviar 73 @@ -5097,12 +5097,12 @@ període tranquil quan es fa la descodificació. D&efault - Per d&efecte + &Per defecte Se&ven - Se&t + S&et @@ -5172,7 +5172,7 @@ uns pocs, particularment alguns equips de Kenwood, ho requereixen. &Hardware - &Maquinari + Ma&quinari @@ -5520,7 +5520,7 @@ els dos canals. S&elect - S&elecciona + Sele&cciona @@ -5595,7 +5595,7 @@ Right click for item specific actions Click, SHIFT+Click and, CRTL+Click to select items Arrossega i deixa anar els elements per reorganitzar l'ordre. Fes clic amb el botó dret per a les accions específiques de l’element. -Fes clic, MAJÚ + clic i, CTRL+clic per seleccionar els elements. +Fes clic, MAJ. + clic i, CTRL+clic per seleccionar els elements. @@ -5653,7 +5653,7 @@ Indicatiu DX i Locator DX quan s’envia un missatge de text 73 o lliure. Clear &DX call and grid after logging - Buida les graelles Indicatiu DX i Locator&DX després del registre + Buida les graelles Indicatiu DX i Locator &DX després del registre From a17eb964a23b9d0d438f59794d5860d8d084c9f7 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 6 Jun 2020 15:15:21 +0100 Subject: [PATCH 3/3] Release note update --- NEWS | 6 +++++- Release_Notes.txt | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0ec8549f7..c72ecb1b7 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,10 @@ prior v2.2.0 release. Here is a brief summary; - Repair a regression that blocked the Highlight Callsign UDP request from highlighting terms including a '+' character. + - Repair a defect that caused hash code lookups of one's own call to + fail after an extended period of inactivity, when operating with a + non-standard callsign. + - Repair a regression where occasional Highlight Callsign UDP requests with the 'Highlight last' parameter as true highlighted a match in a prior period. This fix include a performance improvement @@ -50,7 +54,7 @@ prior v2.2.0 release. Here is a brief summary; - Italian UI translation, tnx Marco, PY1ZRJ. - - Updated Spanish UI translation, tnx Cédric, EA4AC. + - Updated Spanish UI translation, tnx Cédric, EA4AC. Release: WSJT-X 2.2 diff --git a/Release_Notes.txt b/Release_Notes.txt index a1b300d4f..8dd95d486 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -32,6 +32,10 @@ prior v2.2.0 release. Here is a brief summary; - Repair a regression that blocked the Highlight Callsign UDP request from highlighting terms including a '+' character. + - Repair a defect that caused hash code lookups of one's own call to + fail after an extended period of inactivity, when operating with a + non-standard callsign. + - Repair a regression where occasional Highlight Callsign UDP requests with the 'Highlight last' parameter as true highlighted a match in a prior period. This fix include a performance improvement