Merge branch 'master' into develop

2021-01-04 22:57:31 +00:00 · 2021-01-04 22:57:31 +00:00 · e3de5480e2
parent f2e9c1d91d 580363c292
commit e3de5480e2
14 changed files with 239 additions and 21 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -79,7 +79,7 @@ set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
 set (PROJECT_BUNDLE_NAME "WSJT-X")
 set (PROJECT_VENDOR "Joe Taylor, K1JT")
 set (PROJECT_CONTACT "Joe Taylor <k1jt@arrl.net>")
-set (PROJECT_COPYRIGHT "Copyright (C) 2001-2020 by Joe Taylor, K1JT")
+set (PROJECT_COPYRIGHT "Copyright (C) 2001-2021 by Joe Taylor, K1JT")
 set (PROJECT_HOMEPAGE https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html)
 set (PROJECT_MANUAL wsjtx-main)
 set (PROJECT_MANUAL_DIRECTORY_URL https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/)
--- a/121
+++ b/121
@ -10,7 +10,126 @@
 \$$      \$$  \$$$$$$   \$$$$$$     \$$        \$$   \$$
                                                         
                                                         
-Copyright 2001 - 2020 by Joe Taylor, K1JT.
+Copyright 2001 - 2021 by Joe Taylor, K1JT.
+
+
+		   Release: WSJT-X 2.3.0-rc3
+		         Jan 6, 2021
+		   -------------------------
+
+WSJT-X 2.3.0  Release Candidate 3  adds an improved FST4W  decoder and
+fixes  several defects  and  regressions discovered  since the  second
+release candidate.
+
+ - FST4W:  Improve FST4W  decoder sensitivity  on fading  channels and
+   decrease false  decode rate.
+
+   FST4W  uses  50-bit   messages  and  a  24-bit   CRC.   The  74-bit
+   message+CRC is  encoded into a 240-bit  codeword. Received messages
+   are decoded by  two different decoders: (i)  a “belief propagation”
+   (BP)  decoder and  (ii) an  ordered statistics  decoder (OSD).  The
+   ordered statistics  decoder has a knob  that allows any or  all CRC
+   bits to be treated as additional parity bits rather than as part of
+   the  message+CRC  field.  Thus,  the OSD  decoder  can  decode  the
+   received message  as a  (240,50+Nc) code, where  Nc is  any integer
+   between 0  and 24.  In  the RC1 and  RC2 releases the  OSD decoding
+   attempt  treated the  code as  a (240,64)  code (14-bit  CRC). This
+   release uses 2  OSD decoding attempts that treat  the received word
+   as (i) a (240,66) code with 16-bit CRC and code rate 0.308 and (ii)
+   a (240,50) code with no CRC and code rate 0.208. Codewords returned
+   by  the (240,50)  CRC-less decoding  attempt are  unpacked and  the
+   decode is  printed only  if it contains  a callsign/grid  pair that
+   have  been previously  decoded  by the  belief propagation  decoder
+   (which treats the  code as a (240,74) code with  24-bit CRC) or the
+   ordered   statistics  decoder   configured  for   (240,66)  (16-bit
+   CRC). The callsign/grid memory  is stored in file “fst4w_calls.txt”
+   which resides in the data directory.
+
+ - FT8: Fixed a crash triggered by double clicking on the waterfall to
+   invoke a decode of a signal in the preceding T/R interval.
+
+ - FST4W: Do not save .c2 files.
+
+ - FST4W:  Correct a  bug that  could cause  incorrect operation  when
+   using  negative noise  blanker (NB)  percentage to  trigger looping
+   over a range of NB percentages.
+
+ - fst4sim: Added simulation of Lorentzian fading spectrum, invoked by
+   negative fspread values.
+
+ - Color highlighting scheme window fixed in dark mode.
+
+ - Reports sent by QSO partners to  other stations no longer logged in
+   error.
+
+ - UDP Status(1) message now includes the current Tx message.
+
+ - Example diagnostic logging configuration files included.
+
+ - Use system localization for date fields in Log QSO dialog.
+
+ - Improvements to audio input and output buffer sizes.
+
+ - wsprd: Fails gracefully if data directory does not exist.
+
+ - wsjtx_app_version: new utility to print application version string.
+
+ - Regression  causing  incorrect  working  frequency  selection  when
+   changing modes repaired.
+
+ - Regression with QSO initiation with "Best S&P" repaired.
+
+ - Updated installation instructions for macOS covering M1 hardware.
+
+ - Improved compatibility is Debian 9 required distribution packages.
+
+ - Repair regression with missing time-stamps in the ALL.TXT journal.
+
+ - Allow hamlib_settings.json to work  with PTT only configurations so
+   that optional PTT sharing on RTS or DTR can be enabled.
+
+ - Several improvements to main window sizing and layout.
+
+ - Repair regression  with OpenSSL libraries being  required when LoTW
+   highlighting is not enabled.
+
+ - Repair a  defect that  caused 2  by 1  callsigns to  be incorrectly
+   parsed as non-standard.
+
+ - Several updates to international UI translations.
+
+
+
+		   Release: WSJT-X 2.3.0-rc2
+		         Nov 16, 2020
+		   -------------------------
+
+WSJT-X  2.3.0  Release Candidate  2  fixes  issues  found in  RC1  and
+includes some new functionality that missed the RC1 cut off deadline.
+
+ - Dropped audio samples message box  removed, warnings and errors for
+   these are now sent to the WSJT-X system log.
+
+ - FST4W spots to  WSPRNet.org will be augmented such  that the server
+   can distinguish the  mode being spotted. Spots  to WSPRNet.org will
+   no longer be restricted to WSPR sub-bands.
+
+ - A new  internal system  and data logging  facility used  to provide
+   trace,  debug,   information,  warning,  error,  and   fatal  error
+   messages. The verbosity and filtering of messages is user definable
+   via a configuration file. Without  a configuration file a basic log
+   is written with  information, warning and error  messages only. Log
+   files are automatically rotated to limit disk usage.
+
+ - Due to  some users using  inappropriate multicast IP  addresses for
+   their interoperating  severs the default  behaviour now is  to only
+   send multicast  UDP datagrams  to the loop-back  network interface.
+   Users who  require WSJT-X UDP  Message Protocol datagrams  to reach
+   other  hosts will  now  have  to configure  WSJT-X  to  send on  an
+   appropriate  network interface,  and  use  an appropriately  scoped
+   multicast group address for their  server applications.  If you are
+   not sure then  224.0.0.1 (or ff02::1 if IPv6 is  desired) is a safe
+   choice.


 		   Release: WSJT-X 2.3.0-rc1
--- a/Release_Notes.txt
+++ b/Release_Notes.txt
@ -10,7 +10,94 @@
                                                         
                                                         
                                                         
-Copyright 2001 - 2020 by Joe Taylor, K1JT.
+Copyright 2001 - 2021 by Joe Taylor, K1JT.
+
+
+		   Release: WSJT-X 2.3.0-rc3
+		         Jan 6, 2021
+		   -------------------------
+
+WSJT-X 2.3.0  Release Candidate 3  adds an improved FST4W  decoder and
+fixes  several defects  and  regressions discovered  since the  second
+release candidate.
+
+ - FST4W:  Improve FST4W  decoder sensitivity  on fading  channels and
+   decrease false  decode rate.
+
+   FST4W  uses  50-bit   messages  and  a  24-bit   CRC.   The  74-bit
+   message+CRC is  encoded into a 240-bit  codeword. Received messages
+   are decoded by  two different decoders: (i)  a “belief propagation”
+   (BP)  decoder and  (ii) an  ordered statistics  decoder (OSD).  The
+   ordered statistics  decoder has a knob  that allows any or  all CRC
+   bits to be treated as additional parity bits rather than as part of
+   the  message+CRC  field.  Thus,  the OSD  decoder  can  decode  the
+   received message  as a  (240,50+Nc) code, where  Nc is  any integer
+   between 0  and 24.  In  the RC1 and  RC2 releases the  OSD decoding
+   attempt  treated the  code as  a (240,64)  code (14-bit  CRC). This
+   release uses 2  OSD decoding attempts that treat  the received word
+   as (i) a (240,66) code with 16-bit CRC and code rate 0.308 and (ii)
+   a (240,50) code with no CRC and code rate 0.208. Codewords returned
+   by  the (240,50)  CRC-less decoding  attempt are  unpacked and  the
+   decode is  printed only  if it contains  a callsign/grid  pair that
+   have  been previously  decoded  by the  belief propagation  decoder
+   (which treats the  code as a (240,74) code with  24-bit CRC) or the
+   ordered   statistics  decoder   configured  for   (240,66)  (16-bit
+   CRC). The callsign/grid memory  is stored in file “fst4w_calls.txt”
+   which resides in the data directory.
+
+ - FT8: Fixed a crash triggered by double clicking on the waterfall to
+   invoke a decode of a signal in the preceding T/R interval.
+
+ - FST4W: Do not save .c2 files.
+
+ - FST4W:  Correct a  bug that  could cause  incorrect operation  when
+   using  negative noise  blanker (NB)  percentage to  trigger looping
+   over a range of NB percentages.
+
+ - fst4sim: Added simulation of Lorentzian fading spectrum, invoked by
+   negative fspread values.
+
+ - Color highlighting scheme window fixed in dark mode.
+
+ - Reports sent by QSO partners to  other stations no longer logged in
+   error.
+
+ - UDP Status(1) message now includes the current Tx message.
+
+ - Example diagnostic logging configuration files included.
+
+ - Use system localization for date fields in Log QSO dialog.
+
+ - Improvements to audio input and output buffer sizes.
+
+ - wsprd: Fails gracefully if data directory does not exist.
+
+ - wsjtx_app_version: new utility to print application version string.
+
+ - Regression  causing  incorrect  working  frequency  selection  when
+   changing modes repaired.
+
+ - Regression with QSO initiation with "Best S&P" repaired.
+
+ - Updated installation instructions for macOS covering M1 hardware.
+
+ - Improved compatibility is Debian 9 required distribution packages.
+
+ - Repair regression with missing time-stamps in the ALL.TXT journal.
+
+ - Allow hamlib_settings.json to work  with PTT only configurations so
+   that optional PTT sharing on RTS or DTR can be enabled.
+
+ - Several improvements to main window sizing and layout.
+
+ - Repair regression  with OpenSSL libraries being  required when LoTW
+   highlighting is not enabled.
+
+ - Repair a  defect that  caused 2  by 1  callsigns to  be incorrectly
+   parsed as non-standard.
+
+ - Several updates to international UI translations.
+


 		   Release: WSJT-X 2.3.0-rc2
@ -45,6 +132,7 @@ includes some new functionality that missed the RC1 cut off deadline.
   choice.


+
 		   Release: WSJT-X 2.3.0-rc1
 		         Sept 28, 2020
 		   -------------------------
--- a/translations/wsjtx_ca.ts
+++ b/translations/wsjtx_ca.ts
@ -4080,9 +4080,9 @@ La llista es pot mantenir a la configuració (F2).</translation>
        <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-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, 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>
        <translation>Si fas un ús raonable de qualsevol part de WSJT-X segons els termes de la Llicència Pública General de GNU, has de mostrar de manera destacada el següent avís de copyright en el teu treball derivat:
-&quot;Els algoritmes, codi font, aspecte de WSJT-X i programes relacionats i les especificacions de protocol per als modes FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 són Copyright (C) 2001-2020 per un o més dels següents autors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q i altres membres del grup de desenvolupament de WSJT. &quot;</translation>
+&quot;Els algoritmes, codi font, aspecte de WSJT-X i programes relacionats i les especificacions de protocol per als modes FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 són Copyright (C) 2001-2021 per un o més dels següents autors: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q i altres membres del grup de desenvolupament de WSJT. &quot;</translation>
    </message>
    <message>
        <location filename="../widgets/mainwindow.cpp" line="2846"/>
--- a/translations/wsjtx_da.ts
+++ b/translations/wsjtx_da.ts
@ -4076,9 +4076,9 @@ listen. Makro listen kan også ændfres i Inderstillinger (F2).</translation>
        <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-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, 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>
        <translation>Hvis du gør brug af nogen del af WSJT-X under betingelserne i GNU General Public License, skal du vise følgende copyright-meddelelse fremtrædende i din egen udgave:
-&quot;Algoritmerne, kildekoden, udseendet og funktionen af WSJT-X og relaterede programmer og protokolspecifikationer for Mode FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 er Copyright (C) 2001-2020 af en eller flere af følgende forfattere: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; og andre medlemmer af WSJT Development Group. &quot;</translation>
+&quot;Algoritmerne, kildekoden, udseendet og funktionen af WSJT-X og relaterede programmer og protokolspecifikationer for Mode FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 er Copyright (C) 2001-2021 af en eller flere af følgende forfattere: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q; og andre medlemmer af WSJT Development Group. &quot;</translation>
    </message>
    <message>
        <location filename="../widgets/mainwindow.cpp" line="2846"/>
--- a/translations/wsjtx_en.ts
+++ b/translations/wsjtx_en.ts
@ -3831,7 +3831,7 @@ 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-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, 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>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/translations/wsjtx_en_GB.ts
+++ b/translations/wsjtx_en_GB.ts
@ -3831,7 +3831,7 @@ 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-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, 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>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/translations/wsjtx_es.ts
+++ b/translations/wsjtx_es.ts
@ -4411,13 +4411,13 @@ Error al cargar datos de usuarios de LotW</translatorcomment>
        <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-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, 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>
        <translatorcomment>Si haces un uso justo de cualquier parte de WSJT-X bajo los términos de la Licencia Pública General de GNU, debes mostrar el siguiente aviso de copyright de manera destacada en tú trabajo derivado:

-&quot;Los algoritmos, el código fuente, la apariencia de WSJT-X y los programas relacionados, y las especificaciones del protocolo para los modos FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 son Copyright (C) 2001-2020 por uno o más de los siguientes autores: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q y otros miembros del Grupo de Desarrollo WSJT &quot;.</translatorcomment>
+&quot;Los algoritmos, el código fuente, la apariencia de WSJT-X y los programas relacionados, y las especificaciones del protocolo para los modos FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 son Copyright (C) 2001-2021 por uno o más de los siguientes autores: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q y otros miembros del Grupo de Desarrollo WSJT &quot;.</translatorcomment>
        <translation>Si haces un uso justo de cualquier parte de WSJT-X bajo los términos de la Licencia Pública General de GNU, debes mostrar el siguiente aviso de derechos de autor (copyright) de manera destacada en tu trabajo derivado:

-&quot;Los algoritmos, el código fuente, la apariencia y comportamiento del WSJT-X y los programas relacionados, y las especificaciones del protocolo para los modos FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 son Copyright (C) 2001-2020 por uno o más de los siguientes autores: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q y otros miembros del Grupo de Desarrollo WSJT &quot;.</translation>
+&quot;Los algoritmos, el código fuente, la apariencia y comportamiento del WSJT-X y los programas relacionados, y las especificaciones del protocolo para los modos FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 son Copyright (C) 2001-2021 por uno o más de los siguientes autores: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q y otros miembros del Grupo de Desarrollo WSJT &quot;.</translation>
    </message>
    <message>
        <location filename="../widgets/mainwindow.cpp" line="2846"/>
--- a/translations/wsjtx_it.ts
+++ b/translations/wsjtx_it.ts
@ -4063,10 +4063,10 @@ elenco. L&apos;elenco può essere gestito in Impostazioni (F2).</translation>
        <location filename="../widgets/mainwindow.cpp" line="2544"/>
        <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, 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>
        <translation>Se si utilizza in modo equo qualsiasi parte di WSJT-X in base ai termini della GNU General Public License, è necessario visualizzare in modo evidente la seguente nota sul copyright nell&apos;opera derivata:

-&quot;Gli algoritmi, il codice sorgente, l&apos;aspetto di WSJT-X e dei relativi programmi e le specifiche del protocollo per le modalità FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 sono Copyright (C) 2001-2020 di uno o più dei seguenti autori: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q e altri membri del WSJT Development Group. &quot;</translation>
+&quot;Gli algoritmi, il codice sorgente, l&apos;aspetto di WSJT-X e dei relativi programmi e le specifiche del protocollo per le modalità FSK441, FT8, JT4, JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 sono Copyright (C) 2001-2021 di uno o più dei seguenti autori: Joseph Taylor, K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; Philip Karn, KA9Q e altri membri del WSJT Development Group. &quot;</translation>
    </message>
    <message>
        <location filename="../widgets/mainwindow.cpp" line="2812"/>
--- a/translations/wsjtx_ja.ts
+++ b/translations/wsjtx_ja.ts
@ -4032,7 +4032,7 @@ ENTERを押してテキストを登録リストに追加.
        <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-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, 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>
        <translation></translation>
    </message>
    <message>
--- a/translations/wsjtx_zh.ts
+++ b/translations/wsjtx_zh.ts
@ -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-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, 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>
        <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, 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>
    </message>
    <message>
        <location filename="../widgets/mainwindow.cpp" line="2846"/>
--- a/translations/wsjtx_zh_HK.ts
+++ b/translations/wsjtx_zh_HK.ts
@ -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-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, 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>
        <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, 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>
    </message>
    <message>
        <location filename="../widgets/mainwindow.cpp" line="2846"/>
--- a/widgets/about.cpp
+++ b/widgets/about.cpp
@ -18,7 +18,7 @@ CAboutDlg::CAboutDlg(QWidget *parent) :
                             + " " + revision ()}.simplified () + "</h2><br />"
                         "WSJT-X implements a number of digital modes designed for <br />"
                         "weak-signal Amateur Radio communication.  <br /><br />"
-                         "&copy; 2001-2020 by Joe Taylor, K1JT, Bill Somerville, G4WJS, <br />"
+                         "&copy; 2001-2021 by Joe Taylor, K1JT, Bill Somerville, G4WJS, <br />"
                         "and Steve Franke, K9AN.  <br /><br />"
                         "We gratefully acknowledge contributions from AC6SL, AE4JY,<br />"
                         "DF2ET, DJ0OT, G3WDG, G4KLA, IV3NWV, IW3RAB, KA1GT, K3WYC,<br />"
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@ -1034,6 +1034,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,

 void MainWindow::not_GA_warning_message ()
 {
+<<<<<<< HEAD
  // MessageBox::critical_message (this,
  //                               "This is a pre-release version of WSJT-X 2.3.0 made\n"
  //                               "available for testing purposes.  By design it will\n"
@ -1042,6 +1043,16 @@ void MainWindow::not_GA_warning_message ()
  // if (now >= QDateTime {{2021, 1, 19}, {0, 0}, Qt::UTC}) {
  //   Q_EMIT finished ();
  // }
+=======
+  MessageBox::critical_message (this,
+                                "This is a pre-release version of WSJT-X 2.3.0 made\n"
+                                "available for testing purposes.  By design it will\n"
+                                "be nonfunctional after 0000 UTC on Jan 26, 2021.");
+  auto now = QDateTime::currentDateTimeUtc ();
+  if (now >= QDateTime {{2021, 1, 26}, {0, 0}, Qt::UTC}) {
+    Q_EMIT finished ();
+  }
+>>>>>>> master
 }

 void MainWindow::initialize_fonts ()
@ -2598,7 +2609,7 @@ void MainWindow::on_actionCopyright_Notice_triggered()
                           "\"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-2020 by one or more of the following authors: Joseph Taylor, "
+                           "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.\"");