w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-21 19:55:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.2.0'

Browse Source
This commit is contained in:
Bill Somerville 2020-06-02 01:55:57 +01:00
commit b2035db3f5
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
20 changed files with 15985 additions and 2749 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -229,6 +229,7 @@ set (wsjt_qt_CXXSRCS
MetaDataRegistry.cpp
Network/NetworkServerLookup.cpp
revision_utils.cpp
L10nLoader.cpp
WFPalette.cpp
Radio.cpp
RadioMetaType.cpp
@ -1094,20 +1095,25 @@ add_custom_target (ctags COMMAND ${CTAGS} -o ${CMAKE_SOURCE_DIR}/tags -R ${sourc
add_custom_target (etags COMMAND ${ETAGS} -o ${CMAKE_SOURCE_DIR}/TAGS -R ${sources})
# Qt i18n
# Qt i18n - always include the country generic if any regional variant is included
set (LANGUAGES
en # English (we need this to stop
# translation loaders loading the
# second preference UI languge, it
# doesn't need to be populated)
en_GB # English UK
es # Spanish
ca # Catalan
ja # Japanese
zh # Chinese
zh_HK # Chinese per Hong Kong
)
foreach (lang_ ${LANGUAGES})
file (TO_NATIVE_PATH translations/wsjtx_${lang_}.ts ts_)
list (APPEND TS_FILES ${ts_})
set (qt_translations_ "${QT_TRANSLATIONS_DIR}/qtbase_${lang_}.qm")
if (NOT EXISTS "${qt_translations_}")
string (REGEX REPLACE "([a-z][a-z])_[A-Z][A-Z]" "\\1" lang_ ${lang_})
set (qt_translations_ "${QT_TRANSLATIONS_DIR}/qtbase_${lang_}.qm")
file (TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/translations/wsjtx_${lang_}.ts ts_)
if (EXISTS "${ts_}")
list (APPEND TS_FILES ${ts_})
endif ()
set (qt_translations_ "${QT_TRANSLATIONS_DIR}/qtbase_${lang_}.qm")
if (EXISTS "${qt_translations_}")
add_custom_command (
OUTPUT "${CMAKE_BINARY_DIR}/qt_${lang_}.qm"

218
L10nLoader.cpp Normal file
View File

@ -0,0 +1,218 @@
#include "L10nLoader.hpp"
#include <vector>
#include <memory>
#include <QApplication>
#include <QLocale>
#include <QTranslator>
#include <QRegularExpression>
#include <QDebug>
#include "pimpl_impl.hpp"
class L10nLoader::impl final
{
public:
explicit impl(QApplication * app)
: app_ {app}
{
}
bool load_translator (QString const& filename
, QString const& directory = QString {}
, QString const& search_delimiters = QString {}
, QString const& suffix = QString {})
{
std::unique_ptr<QTranslator> translator {new QTranslator};
if (translator->load (filename, directory, search_delimiters, suffix))
{
install (std::move (translator));
return true;
}
return false;
}
bool load_translator (QLocale const& locale, QString const& filename
, QString const& prefix = QString {}
, QString const& directory = QString {}
, QString const& suffix = QString {})
{
std::unique_ptr<QTranslator> translator {new QTranslator};
if (translator->load (locale, filename, prefix, directory, suffix))
{
install (std::move (translator));
return true;
}
return false;
}
void install (std::unique_ptr<QTranslator> translator)
{
app_->installTranslator (translator.get ());
translators_.push_back (std::move (translator));
}
QApplication * app_;
std::vector<std::unique_ptr<QTranslator>> translators_;
};
L10nLoader::L10nLoader (QApplication * app, QLocale const& locale, QString const& language_override)
: m_ {app}
{
qDebug () << QString {"locale: language: %1 script: %2 country: %3 ui-languages: %4"}
.arg (QLocale::languageToString (locale.language ()))
.arg (QLocale::scriptToString (locale.script ()))
.arg (QLocale::countryToString (locale.country ()))
.arg (locale.uiLanguages ().join (", "));
// we don't load translators if the language override is 'en',
// 'en_US', or 'en-US'. In these cases we assume the user is trying
// to disable translations loaded because of their locale. We cannot
// load any locale based translations in this case.
auto skip_locale = language_override.contains (QRegularExpression {"^(?:en|en[-_]US)$"});
//
// Enable base i18n
//
QString translations_dir {":/Translations"};
if (!skip_locale)
{
qDebug () << "Looking for locale based Qt translations in resources filesystem";
if (m_->load_translator (locale, "qt", "_", translations_dir))
{
qDebug () << "Loaded Qt translations for current locale from resources";
}
// Default translations for releases use translations stored in
// the resources file system under the Translations
// directory. These are built by the CMake build system from .ts
// files in the translations source directory. New languages are
// added by enabling the UPDATE_TRANSLATIONS CMake option and
// building with the new language added to the LANGUAGES CMake
// list variable. UPDATE_TRANSLATIONS will preserve existing
// translations but should only be set when adding new
// languages. The resulting .ts files should be checked info
// source control for translators to access and update.
// try and load the base translation
qDebug () << "Looking for WSJT-X translations based on UI languages in the resources filesystem";
for (QString locale_name : locale.uiLanguages ())
{
auto language = locale_name.left (2);
if (locale.uiLanguages ().front ().left (2) == language)
{
qDebug () << QString {"Trying %1"}.arg (language);
if (m_->load_translator ("wsjtx_" + language, translations_dir))
{
qDebug () << QString {"Loaded WSJT-X base translation file from %1 based on language %2"}
.arg (translations_dir)
.arg (language);
break;
}
}
}
// now try and load the most specific translations (may be a
// duplicate but we shouldn't care)
qDebug () << "Looking for WSJT-X translations based on locale in the resources filesystem";
if (m_->load_translator (locale, "wsjtx", "_", translations_dir))
{
qDebug () << "Loaded WSJT-X translations for current locale from resources";
}
}
// Load any matching translation from the current directory
// using the command line option language override. This allows
// translators to easily test their translations by releasing
// (lrelease) a .qm file into the current directory with a
// suitable name (e.g. wsjtx_en_GB.qm), then running wsjtx to
// view the results.
if (language_override.size ())
{
auto language = language_override;
language.replace ('-', '_');
// try and load the base translation
auto base_language = language.left (2);
qDebug () << "Looking for WSJT-X translations based on command line region override in the resources filesystem";
if (m_->load_translator ("wsjtx_" + base_language, translations_dir))
{
qDebug () << QString {"Loaded base translation file from %1 based on language %2"}
.arg (translations_dir)
.arg (base_language);
}
// now load the requested translations (may be a duplicate
// but we shouldn't care)
qDebug () << "Looking for WSJT-X translations based on command line override country in the resources filesystem";
if (m_->load_translator ("wsjtx_" + language, translations_dir))
{
qDebug () << QString {"Loaded translation file from %1 based on language %2"}
.arg (translations_dir)
.arg (language);
}
}
// Load any matching translation from the current directory using
// the current locale. This allows translators to easily test their
// translations by releasing (lrelease) a .qm file into the current
// directory with a suitable name (e.g. wsjtx_en_GB.qm), then
// running wsjtx to view the results. The system locale setting will
// be used to select the translation file which can be overridden by
// the LANG environment variable on non-Windows system.
// try and load the base translation
qDebug () << "Looking for WSJT-X translations based on command line override country in the current directory";
for (QString locale_name : locale.uiLanguages ())
{
auto language = locale_name.left (2);
if (locale.uiLanguages ().front ().left (2) == language)
{
qDebug () << QString {"Trying %1"}.arg (language);
if (m_->load_translator ("wsjtx_" + language))
{
qDebug () << QString {"Loaded base translation file from $cwd based on language %1"}.arg (language);
break;
}
}
}
if (!skip_locale)
{
// now try and load the most specific translations (may be a
// duplicate but we shouldn't care)
qDebug () << "Looking for WSJT-X translations based on locale in the resources filesystem";
if (m_->load_translator (locale, "wsjtx", "_"))
{
qDebug () << "loaded translations for current locale from a file";
}
}
// Load any matching translation from the current directory using
// the command line option language override. This allows
// translators to easily test their translations on Windows by
// releasing (lrelease) a .qm file into the current directory with a
// suitable name (e.g. wsjtx_en_GB.qm), then running wsjtx to view
// the results.
if (language_override.size ())
{
auto language = language_override;
language.replace ('-', '_');
// try and load the base translation
auto base_language = language.left (2);
qDebug () << "Looking for WSJT-X translations based on command line override country in the current directory";
if (m_->load_translator ("wsjtx_" + base_language))
{
qDebug () << QString {"Loaded base translation file from $cwd based on language %1"}.arg (base_language);
}
// now load the requested translations (may be a duplicate
// but we shouldn't care)
qDebug () << "Looking for WSJT-X translations based on command line region in the current directory";
if (m_->load_translator ("wsjtx_" + language))
{
qDebug () << QString {"loaded translation file from $cwd based on language %1"}.arg (language);
}
}
}
L10nLoader::~L10nLoader ()
{
}

21
L10nLoader.hpp Normal file
View File

@ -0,0 +1,21 @@
#ifndef WSJTX_L10N_LOADER_HPP__
#define WSJTX_L10N_LOADER_HPP__
#include <QString>
#include "pimpl_h.hpp"
class QApplication;
class QLocale;
class L10nLoader final
{
public:
explicit L10nLoader (QApplication *, QLocale const&, QString const& language_override = QString {});
~L10nLoader ();
private:
class impl;
pimpl<impl> m_;
};
#endif

70
Release_Notes.txt
View File

@ -12,8 +12,76 @@
Copyright 2001 - 2020 by Joe Taylor, K1JT.
Release: WSJT-X 2.2
June 2, 2020
-------------------
WSJT-X 2.2 is a program upgrade that provides a number of new features
and capabilities. Here is a brief summary; for further details see
the notes for candidate releases 2.2.0-rc1, -rc2, and -rc3, below, and
of course the updated WSJT-X 2.2 User Guide.
- Significant improvements to the decoders for FT4, FT8, JT4, JT65,
and WSPR.
- New format for "EU VHF Contest" Tx2 and Tx3 messages
When "EU VHF Contest" is selected, the Tx2 and Tx3 messages (those
conveying signal report, serial number, and 6-character locator)
now use hashcodes for both callsigns. This change is NOT backward
compatible with earlier versions of _WSJT-X_, so all users of EU
VHF Contest messages should be sure to upgrade to version 2.2.0.
- Accessibility
Keyboard shortcuts have been added as an aid to accessibility:
Alt+R sets Tx4 message to RR73, Ctrl+R sets it to RRR.
As an aid for partial color-blindness, the "inverted goal posts"
marking Rx frequency on the Wide Graph's frequency scale are now
rendered in a darker shade of green.
- User Interface Translations have been enabled. Translations are
now available for Catalan, Spanish, Japanese, Chinese, and Hong
Kong Chinese. Additiional languages will follow, when available.
Note that UI translation is automatic, based on your system primary
language. If you do not want the WSJT-X UI translated to your local
language then start WSJT-X with the '--language=en' command line
option:
wsjtx --language=en
If you wish to contribute by authoring WSJT-X UI translations
please join the new discussion group wsjtx-l10n@Groups.io
(https://groups.io/g/wsjtx-l10n), where help from other translation
authors and coordination with the development team is available.
- Minor enhancements and bug fixes
"Save None" now writes no .wav files to disk, even temporarily.
An explicit entry for "WW Digi Contest" has been added to
"Special operating activities" on the "Settings | Advanced" tab.
Contest mode FT4 now always uses RR73 for the Tx4 message.
The Status bar now displays the number of decodes found in the
most recent Rx sequence.
The "Highlight Callsign" UDP message has been enhanced to allow
clearing of old highlighting for a specified callsign. Please note
a recommended restriction on the use of this message in the
documentation here: https://tinyurl.com/y85nc3tg
- Hamlib - this library which we use for direct rig control has had
many defect repairs and enhancements, we thank the contributors to
that project for their work.
Release: WSJT-X 2.2.0-rc3
May 30, 2020
May 29, 2020
-------------------------
WSJT-X 2.2.0-rc3 is the third release candidate for WSJT-X 2.2.0.

6
Transceiver/HamlibTransceiver.cpp
View File

@ -374,9 +374,11 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
case TransceiverFactory::PTT_method_DTR:
case TransceiverFactory::PTT_method_RTS:
if (!params.ptt_port.isEmpty ()
if (params.ptt_port.size ()
&& params.ptt_port != "None"
&& (is_dummy_ || params.ptt_port != params.serial_port))
&& (is_dummy_
|| RIG_PORT_SERIAL != rig_->caps->port_type
|| params.ptt_port != params.serial_port))
{
#if defined (WIN32)
set_conf ("ptt_pathname", ("\\\\.\\" + params.ptt_port).toLatin1 ().data ());

20
Transceiver/OmniRigTransceiver.cpp
View File

@ -162,6 +162,9 @@ int OmniRigTransceiver::do_start ()
Q_ASSERT (rig_);
Q_ASSERT (!rig_->isNull ());
// COM/OLE exceptions get signaled
connect (&*rig_, SIGNAL (exception (int, QString, QString, QString)), this, SLOT (handle_COM_exception (int, QString, QString, QString)));
offline_timer_.reset (new QTimer); // instantiate here as
// constructor runs in wrong
// thread
@ -175,12 +178,17 @@ int OmniRigTransceiver::do_start ()
Q_ASSERT (port_);
Q_ASSERT (!port_->isNull ());
// COM/OLE exceptions get signaled
connect (&*port_, SIGNAL (exception (int, QString, QString, QString)), this, SLOT (handle_COM_exception (int, QString, QString, QString)));
TRACE_CAT ("OmniRigTransceiver", "OmniRig RTS state:" << port_->Rts ());
if (!port_->Lock ()) // try to take exclusive use of the OmniRig serial port for PTT
{
TRACE_CAT ("OmniRigTransceiver", "Failed to get exclusive use of serial port for PTT from OmniRig");
}
// remove locking because it doesn't seem to work properly
// if (!port_->Lock ()) // try to take exclusive use of the OmniRig serial port for PTT
// {
// TRACE_CAT ("OmniRigTransceiver", "Failed to get exclusive use of serial port for PTT from OmniRig");
// }
// start off so we don't accidentally key the radio
if (TransceiverFactory::PTT_method_DTR == ptt_type_)
@ -314,9 +322,9 @@ void OmniRigTransceiver::do_stop ()
// destructor as destructor runs in
// wrong thread
if (port_)
if (port_ && !port_->isNull ())
{
port_->Unlock (); // release serial port
// port_->Unlock (); // release serial port
port_->clear ();
port_.reset ();
}

4
Versions.cmake
View File

@ -2,5 +2,5 @@
set (WSJTX_VERSION_MAJOR 2)
set (WSJTX_VERSION_MINOR 2)
set (WSJTX_VERSION_PATCH 0)
set (WSJTX_RC 3) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
set (WSJTX_RC 4) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build

4
lib/jt65_decode.f90
View File

@ -176,8 +176,8 @@ contains
endif
df=12000.0/8192.0 !df = 1.465 Hz
if(bVHF) then
ia=max(1,nint(nfa/df)-ntol)
ib=min(NSZ,nint(nfb/df)+ntol)
ia=max(1,nint((nfa-100)/df))
ib=min(NSZ,nint((nfb+100)/df))
nz=ib-ia+1
call lorentzian(savg(ia),nz,a)
baseline=a(1)

187
main.cpp
View File

@ -15,7 +15,6 @@
#include <QRegularExpression>
#include <QObject>
#include <QSettings>
#include <QLibraryInfo>
#include <QSysInfo>
#include <QDir>
#include <QDirIterator>
@ -31,6 +30,7 @@
#include "revision_utils.hpp"
#include "MetaDataRegistry.hpp"
#include "L10nLoader.hpp"
#include "SettingsGroup.hpp"
#include "TraceFile.hpp"
#include "MultiSettings.hpp"
@ -109,14 +109,6 @@ int main(int argc, char *argv[])
ExceptionCatchingApplication a(argc, argv);
try
{
std::unique_ptr<QStringList> early_messages {new QStringList};
QLocale locale; // get the current system locale
*early_messages << QString {"locale: language: %1 script: %2 country: %3 ui-languages: %4"}
.arg (QLocale::languageToString (locale.language ()))
.arg (QLocale::scriptToString (locale.script ()))
.arg (QLocale::countryToString (locale.country ()))
.arg (locale.uiLanguages ().join (", "));
// qDebug () << "+++++++++++++++++++++++++++ Resources ++++++++++++++++++++++++++++";
// {
// QDirIterator resources_iter {":/", QDirIterator::Subdirectories};
@ -126,6 +118,8 @@ int main(int argc, char *argv[])
// }
// }
// qDebug () << "--------------------------- Resources ----------------------------";
QLocale locale; // get the current system locale
setlocale (LC_NUMERIC, "C"); // ensure number forms are in
// consistent format, do this after
// instantiating QApplication so
@ -135,55 +129,6 @@ int main(int argc, char *argv[])
a.setApplicationName ("WSJT-X");
a.setApplicationVersion (version ());
//
// Enable base i18n
//
QString translations_dir {":/Translations"};
QTranslator qt_translator;
if (qt_translator.load (locale, "qt", "_", translations_dir))
{
*early_messages << "Loaded Qt translations for current locale from resources";
a.installTranslator (&qt_translator);
}
// Default translations for releases use translations stored in
// the resources file system under the Translations
// directory. These are built by the CMake build system from .ts
// files in the translations source directory. New languages are
// added by enabling the UPDATE_TRANSLATIONS CMake option and
// building with the new language added to the LANGUAGES CMake
// list variable. UPDATE_TRANSLATIONS will preserve existing
// translations but should only be set when adding new
// languages. The resulting .ts files should be checked info
// source control for translators to access and update.
// try and load the base translation
QTranslator base_translator_from_resources;
for (QString locale_name : locale.uiLanguages ())
{
auto language = locale_name.left (2);
if (locale.uiLanguages ().front ().left (2) == language)
{
*early_messages << QString {"Trying %1"}.arg (language);
if (base_translator_from_resources.load ("wsjtx_" + language, translations_dir))
{
*early_messages << QString {"Loaded base translation file from %1 based on language %2"}
.arg (translations_dir)
.arg (language);
a.installTranslator (&base_translator_from_resources);
break;
}
}
}
// now try and load the most specific translations (may be a
// duplicate but we shouldn't care)
QTranslator translator_from_resources;
if (translator_from_resources.load (locale, "wsjtx", "_", translations_dir))
{
*early_messages << "Loaded translations for current locale from resources";
a.installTranslator (&translator_from_resources);
}
QCommandLineParser parser;
parser.setApplicationDescription ("\n" PROJECT_SUMMARY_DESCRIPTION);
auto help_option = parser.addHelpOption ();
@ -191,140 +136,47 @@ int main(int argc, char *argv[])
// support for multiple instances running from a single installation
QCommandLineOption rig_option (QStringList {} << "r" << "rig-name"
, a.translate ("main", "Where <rig-name> is for multi-instance support.")
, a.translate ("main", "rig-name"));
, "Where <rig-name> is for multi-instance support."
, "rig-name");
parser.addOption (rig_option);
// support for start up configuration
QCommandLineOption cfg_option (QStringList {} << "c" << "config"
, a.translate ("main", "Where <configuration> is an existing one.")
, a.translate ("main", "configuration"));
, "Where <configuration> is an existing one."
, "configuration");
parser.addOption (cfg_option);
// support for UI language override (useful on Windows)
QCommandLineOption lang_option (QStringList {} << "l" << "language"
, a.translate ("main", "Where <language> is <lang-code>[-<country-code>].")
, a.translate ("main", "language"));
, "Where <language> is <lang-code>[-<country-code>]."
, "language");
parser.addOption (lang_option);
QCommandLineOption test_option (QStringList {} << "test-mode"
, a.translate ("main", "Writable files in test location. Use with caution, for testing only."));
, "Writable files in test location. Use with caution, for testing only.");
parser.addOption (test_option);
if (!parser.parse (a.arguments ()))
{
MessageBox::critical_message (nullptr, a.translate ("main", "Command line error"), parser.errorText ());
MessageBox::critical_message (nullptr, "Command line error", parser.errorText ());
return -1;
}
else
{
if (parser.isSet (help_option))
{
MessageBox::information_message (nullptr, a.translate ("main", "Command line help"), parser.helpText ());
MessageBox::information_message (nullptr, "Command line help", parser.helpText ());
return 0;
}
else if (parser.isSet (version_option))
{
MessageBox::information_message (nullptr, a.translate ("main", "Application version"), a.applicationVersion ());
MessageBox::information_message (nullptr, "Application version", a.applicationVersion ());
return 0;
}
}
//
// Complete i18n
//
// Load any matching translation from the current directory
// using the command line option language override. This allows
// translators to easily test their translations by releasing
// (lrelease) a .qm file into the current directory with a
// suitable name (e.g. wsjtx_en_GB.qm), then running wsjtx to
// view the results.
QTranslator base_translation_override_from_resources;
QTranslator translation_override_from_resources;
if (parser.isSet (lang_option))
{
auto language = parser.value (lang_option).replace ('-', '_');
// try and load the base translation
auto base_language = language.left (2);
if (base_translation_override_from_resources.load ("wsjtx_" + base_language, translations_dir))
{
*early_messages << QString {"Loaded base translation file from %1 based on language %2"}
.arg (translations_dir)
.arg (base_language);
a.installTranslator (&base_translation_override_from_resources);
}
// now load the requested translations (may be a duplicate
// but we shouldn't care)
if (translation_override_from_resources.load ("wsjtx_" + language, translations_dir))
{
*early_messages << QString {"Loaded translation file from %1 based on language %2"}
.arg (translations_dir)
.arg (language);
a.installTranslator (&translation_override_from_resources);
}
}
// Load any matching translation from the current directory
// using the current locale. This allows translators to easily
// test their translations by releasing (lrelease) a .qm file
// into the current directory with a suitable name (e.g.
// wsjtx_en_GB.qm), then running wsjtx to view the results. The
// system locale setting will be used to select the translation
// file which can be overridden by the LANG environment variable
// on non-Windows system.
// try and load the base translation
QTranslator base_translator_from_cwd;
for (QString locale_name : locale.uiLanguages ())
{
auto language = locale_name.left (2);
if (locale.uiLanguages ().front ().left (2) == language)
{
*early_messages << QString {"Trying %1"}.arg (language);
if (base_translator_from_cwd.load ("wsjtx_" + language))
{
*early_messages << QString {"Loaded base translation file from $cwd based on language %1"}.arg (language);
a.installTranslator (&base_translator_from_cwd);
break;
}
}
}
// now try and load the most specific translations (may be a
// duplicate but we shouldn't care)
QTranslator translator_from_cwd;
if (translator_from_cwd.load (locale, "wsjtx", "_"))
{
*early_messages << "loaded translations for current locale from a file";
a.installTranslator (&translator_from_cwd);
}
// Load any matching translation from the current directory
// using the command line option language override. This allows
// translators to easily test their translations on Windows by
// releasing (lrelease) a .qm file into the current directory
// with a suitable name (e.g. wsjtx_en_GB.qm), then running
// wsjtx to view the results.
QTranslator base_translation_override_from_cwd;
QTranslator translation_override_from_cwd;
if (parser.isSet (lang_option))
{
auto language = parser.value (lang_option).replace ('-', '_');
// try and load the base translation
auto base_language = language.left (2);
if (base_translation_override_from_cwd.load ("wsjtx_" + base_language))
{
*early_messages << QString {"Loaded base translation file from $cwd based on language %1"}.arg (base_language);
a.installTranslator (&base_translation_override_from_cwd);
}
// now load the requested translations (may be a duplicate
// but we shouldn't care)
if (translation_override_from_cwd.load ("wsjtx_" + language))
{
*early_messages << QString {"loaded translation file from $cwd based on language %1"}.arg (language);
a.installTranslator (&translation_override_from_cwd);
}
}
// load UI translations
L10nLoader l10n {&a, locale, parser.value (lang_option)};
QStandardPaths::setTestModeEnabled (parser.isSet (test_option));
@ -337,7 +189,7 @@ int main(int argc, char *argv[])
{
if (temp_name.contains (QRegularExpression {R"([\\/,])"}))
{
std::cerr << QObject::tr ("Invalid rig name - \\ & / not allowed").toLocal8Bit ().data () << std::endl;
std::cerr << "Invalid rig name - \\ & / not allowed" << std::endl;
parser.showHelp (-1);
}
@ -395,13 +247,6 @@ int main(int argc, char *argv[])
qDebug () << program_title (revision ()) + " - Program startup";
#endif
// trace early messages now we have a trace file
for (auto const& message : *early_messages)
{
qDebug () << message;
}
early_messages.reset (); // free memory
// Create a unique writeable temporary directory in a suitable location
bool temp_ok {false};
QString unique_directory {QApplication::applicationName ()};

4
models/FrequencyList.cpp
View File

@ -124,7 +124,6 @@ namespace
// 7110 LSB EMCOMM
//
{7038600, Modes::WSPR, IARURegions::ALL},
{7071000, Modes::FT8, IARURegions::ALL},
{7074000, Modes::FT8, IARURegions::ALL},
{7076000, Modes::JT65, IARURegions::ALL},
{7078000, Modes::JT9, IARURegions::ALL},
@ -158,7 +157,6 @@ namespace
// 10142.25 OLIVIA, Contestia, etc.
// 10143.25 OLIVIA, Contestia, etc. (main QRQ)
//
{10133000, Modes::FT8, IARURegions::ALL},
{10136000, Modes::FT8, IARURegions::ALL},
{10138000, Modes::JT65, IARURegions::ALL},
{10138700, Modes::WSPR, IARURegions::ALL},
@ -203,7 +201,6 @@ namespace
// 14106.5 OLIVIA 1000 (main QRG)
//
{14095600, Modes::WSPR, IARURegions::ALL},
{14071000, Modes::FT8, IARURegions::ALL},
{14074000, Modes::FT8, IARURegions::ALL},
{14076000, Modes::JT65, IARURegions::ALL},
{14078000, Modes::JT9, IARURegions::ALL},
@ -270,7 +267,6 @@ namespace
{50293000, Modes::WSPR, IARURegions::R3},
{50310000, Modes::JT65, IARURegions::ALL},
{50312000, Modes::JT9, IARURegions::ALL},
{50310000, Modes::FT8, IARURegions::ALL},
{50313000, Modes::FT8, IARURegions::ALL},
{50318000, Modes::FT4, IARURegions::ALL}, // provisional
{50323000, Modes::FT8, IARURegions::ALL},

579
translations/wsjtx_ca.ts
View File

File diff suppressed because it is too large Load Diff

1037
translations/wsjtx_pt.ts → translations/wsjtx_en.ts
View File

File diff suppressed because it is too large Load Diff

384
translations/wsjtx_en_GB.ts
View File

@ -1538,178 +1538,178 @@ Error: %2 - %3</source>
<context>
<name>HamlibTransceiver</name>
<message>
<location filename="../HamlibTransceiver.cpp" line="201"/>
<location filename="../HamlibTransceiver.cpp" line="254"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="202"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="256"/>
<source>Hamlib initialisation error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="276"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="278"/>
<source>Hamlib settings file error: %1 at character offset %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="282"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="284"/>
<source>Hamlib settings file error: top level must be a JSON object</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="294"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="296"/>
<source>Hamlib settings file error: config must be a JSON object</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="359"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="361"/>
<source>Unsupported CAT type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="410"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="412"/>
<source>Hamlib error: %1 while %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="420"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="422"/>
<source>opening connection to rig</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="467"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="469"/>
<source>getting current frequency</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="471"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="473"/>
<source>getting current mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="500"/>
<location filename="../HamlibTransceiver.cpp" line="520"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="502"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="522"/>
<source>exchanging VFOs</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="508"/>
<location filename="../HamlibTransceiver.cpp" line="979"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="510"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="981"/>
<source>getting other VFO frequency</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="512"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="514"/>
<source>getting other VFO mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="525"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="527"/>
<source>setting current VFO</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="534"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="536"/>
<source>getting frequency</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="538"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="540"/>
<source>getting mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="555"/>
<location filename="../HamlibTransceiver.cpp" line="919"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="557"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="921"/>
<source>getting current VFO</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="599"/>
<location filename="../HamlibTransceiver.cpp" line="607"/>
<location filename="../HamlibTransceiver.cpp" line="621"/>
<location filename="../HamlibTransceiver.cpp" line="958"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="601"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="609"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="623"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="960"/>
<source>getting current VFO frequency</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="605"/>
<location filename="../HamlibTransceiver.cpp" line="620"/>
<location filename="../HamlibTransceiver.cpp" line="627"/>
<location filename="../HamlibTransceiver.cpp" line="706"/>
<location filename="../HamlibTransceiver.cpp" line="724"/>
<location filename="../HamlibTransceiver.cpp" line="785"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="607"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="622"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="629"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="708"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="726"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="787"/>
<source>setting frequency</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="714"/>
<location filename="../HamlibTransceiver.cpp" line="792"/>
<location filename="../HamlibTransceiver.cpp" line="864"/>
<location filename="../HamlibTransceiver.cpp" line="877"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="716"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="794"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="866"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="879"/>
<source>getting current VFO mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="720"/>
<location filename="../HamlibTransceiver.cpp" line="729"/>
<location filename="../HamlibTransceiver.cpp" line="798"/>
<location filename="../HamlibTransceiver.cpp" line="870"/>
<location filename="../HamlibTransceiver.cpp" line="883"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="722"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="731"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="800"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="872"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="885"/>
<source>setting current VFO mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="772"/>
<location filename="../HamlibTransceiver.cpp" line="841"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="774"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="843"/>
<source>setting/unsetting split mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="783"/>
<location filename="../HamlibTransceiver.cpp" line="823"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="785"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="825"/>
<source>setting split mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="811"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="813"/>
<source>setting split TX frequency and mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="816"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="818"/>
<source>setting split TX frequency</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="888"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="890"/>
<source>getting split TX VFO mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="895"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="897"/>
<source>setting split TX VFO mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="1016"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="1018"/>
<source>getting PTT state</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="1047"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="1049"/>
<source>setting PTT on</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="1055"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="1057"/>
<source>setting PTT off</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="1067"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="1069"/>
<source>setting a configuration item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../HamlibTransceiver.cpp" line="1077"/>
<location filename="../Transceiver/HamlibTransceiver.cpp" line="1079"/>
<source>getting a configuration item</source>
<translation type="unfinished"></translation>
</message>
@ -1912,12 +1912,12 @@ Error(%2): %3</source>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="50"/>
<location filename="../widgets/mainwindow.cpp" line="5792"/>
<location filename="../widgets/mainwindow.cpp" line="5840"/>
<location filename="../widgets/mainwindow.cpp" line="5998"/>
<location filename="../widgets/mainwindow.cpp" line="6038"/>
<location filename="../widgets/mainwindow.cpp" line="6086"/>
<location filename="../widgets/mainwindow.cpp" line="6211"/>
<location filename="../widgets/mainwindow.cpp" line="5793"/>
<location filename="../widgets/mainwindow.cpp" line="5841"/>
<location filename="../widgets/mainwindow.cpp" line="5999"/>
<location filename="../widgets/mainwindow.cpp" line="6039"/>
<location filename="../widgets/mainwindow.cpp" line="6087"/>
<location filename="../widgets/mainwindow.cpp" line="6212"/>
<source>Band Activity</source>
<translation type="unfinished"></translation>
</message>
@ -1929,11 +1929,11 @@ Error(%2): %3</source>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="194"/>
<location filename="../widgets/mainwindow.cpp" line="5791"/>
<location filename="../widgets/mainwindow.cpp" line="5835"/>
<location filename="../widgets/mainwindow.cpp" line="5999"/>
<location filename="../widgets/mainwindow.cpp" line="6039"/>
<location filename="../widgets/mainwindow.cpp" line="6087"/>
<location filename="../widgets/mainwindow.cpp" line="5792"/>
<location filename="../widgets/mainwindow.cpp" line="5836"/>
<location filename="../widgets/mainwindow.cpp" line="6000"/>
<location filename="../widgets/mainwindow.cpp" line="6040"/>
<location filename="../widgets/mainwindow.cpp" line="6088"/>
<source>Rx Frequency</source>
<translation type="unfinished"></translation>
</message>
@ -2391,7 +2391,7 @@ Not available to nonstandard callsign holders.</source>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="1394"/>
<location filename="../widgets/mainwindow.cpp" line="5862"/>
<location filename="../widgets/mainwindow.cpp" line="5863"/>
<source>Fox</source>
<translation type="unfinished"></translation>
</message>
@ -3232,7 +3232,7 @@ list. The list can be maintained in Settings (F2).</source>
</message>
<message>
<location filename="../widgets/mainwindow.ui" line="3125"/>
<location filename="../widgets/mainwindow.cpp" line="8101"/>
<location filename="../widgets/mainwindow.cpp" line="8102"/>
<source>Runaway Tx watchdog</source>
<translation type="unfinished"></translation>
</message>
@ -3509,8 +3509,8 @@ list. The list can be maintained in Settings (F2).</source>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="329"/>
<location filename="../widgets/mainwindow.cpp" line="4111"/>
<location filename="../widgets/mainwindow.cpp" line="7629"/>
<location filename="../widgets/mainwindow.cpp" line="4112"/>
<location filename="../widgets/mainwindow.cpp" line="7630"/>
<source>Receiving</source>
<translation type="unfinished"></translation>
</message>
@ -3546,21 +3546,21 @@ list. The list can be maintained in Settings (F2).</source>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="823"/>
<location filename="../widgets/mainwindow.cpp" line="5787"/>
<location filename="../widgets/mainwindow.cpp" line="5793"/>
<location filename="../widgets/mainwindow.cpp" line="5831"/>
<location filename="../widgets/mainwindow.cpp" line="5841"/>
<location filename="../widgets/mainwindow.cpp" line="5938"/>
<location filename="../widgets/mainwindow.cpp" line="5788"/>
<location filename="../widgets/mainwindow.cpp" line="5794"/>
<location filename="../widgets/mainwindow.cpp" line="5832"/>
<location filename="../widgets/mainwindow.cpp" line="5842"/>
<location filename="../widgets/mainwindow.cpp" line="5939"/>
<location filename="../widgets/mainwindow.cpp" line="5987"/>
<location filename="../widgets/mainwindow.cpp" line="5940"/>
<location filename="../widgets/mainwindow.cpp" line="5988"/>
<location filename="../widgets/mainwindow.cpp" line="5992"/>
<location filename="../widgets/mainwindow.cpp" line="5989"/>
<location filename="../widgets/mainwindow.cpp" line="5993"/>
<location filename="../widgets/mainwindow.cpp" line="6040"/>
<location filename="../widgets/mainwindow.cpp" line="5994"/>
<location filename="../widgets/mainwindow.cpp" line="6041"/>
<location filename="../widgets/mainwindow.cpp" line="6206"/>
<location filename="../widgets/mainwindow.cpp" line="6042"/>
<location filename="../widgets/mainwindow.cpp" line="6207"/>
<location filename="../widgets/mainwindow.cpp" line="6392"/>
<location filename="../widgets/mainwindow.cpp" line="6208"/>
<location filename="../widgets/mainwindow.cpp" line="6393"/>
<source>Message</source>
<translation type="unfinished"></translation>
</message>
@ -3585,115 +3585,115 @@ list. The list can be maintained in Settings (F2).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1253"/>
<location filename="../widgets/mainwindow.cpp" line="6181"/>
<location filename="../widgets/mainwindow.cpp" line="1254"/>
<location filename="../widgets/mainwindow.cpp" line="6182"/>
<source>Improper mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1404"/>
<location filename="../widgets/mainwindow.cpp" line="8728"/>
<location filename="../widgets/mainwindow.cpp" line="1405"/>
<location filename="../widgets/mainwindow.cpp" line="8729"/>
<source>File Open Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1405"/>
<location filename="../widgets/mainwindow.cpp" line="7746"/>
<location filename="../widgets/mainwindow.cpp" line="8175"/>
<location filename="../widgets/mainwindow.cpp" line="8729"/>
<location filename="../widgets/mainwindow.cpp" line="8855"/>
<location filename="../widgets/mainwindow.cpp" line="1406"/>
<location filename="../widgets/mainwindow.cpp" line="7747"/>
<location filename="../widgets/mainwindow.cpp" line="8176"/>
<location filename="../widgets/mainwindow.cpp" line="8730"/>
<location filename="../widgets/mainwindow.cpp" line="8856"/>
<source>Cannot open &quot;%1&quot; for append: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1503"/>
<location filename="../widgets/mainwindow.cpp" line="1504"/>
<source>Error saving c2 file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1715"/>
<location filename="../widgets/mainwindow.cpp" line="1716"/>
<source>Error in Sound Input</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1721"/>
<location filename="../widgets/mainwindow.cpp" line="1722"/>
<source>Error in Sound Output</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1777"/>
<location filename="../widgets/mainwindow.cpp" line="5936"/>
<location filename="../widgets/mainwindow.cpp" line="6082"/>
<source>Single-Period Decodes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1778"/>
<location filename="../widgets/mainwindow.cpp" line="5937"/>
<location filename="../widgets/mainwindow.cpp" line="6083"/>
<source>Single-Period Decodes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="1779"/>
<location filename="../widgets/mainwindow.cpp" line="5938"/>
<location filename="../widgets/mainwindow.cpp" line="6084"/>
<source>Average Decodes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2079"/>
<location filename="../widgets/mainwindow.cpp" line="2080"/>
<source>Change Operator</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2079"/>
<location filename="../widgets/mainwindow.cpp" line="2080"/>
<source>New operator:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2189"/>
<location filename="../widgets/mainwindow.cpp" line="2190"/>
<source>Status File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2190"/>
<location filename="../widgets/mainwindow.cpp" line="5400"/>
<location filename="../widgets/mainwindow.cpp" line="2191"/>
<location filename="../widgets/mainwindow.cpp" line="5401"/>
<source>Cannot open &quot;%1&quot; for writing: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2321"/>
<location filename="../widgets/mainwindow.cpp" line="2322"/>
<source>Subprocess Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2322"/>
<location filename="../widgets/mainwindow.cpp" line="2323"/>
<source>Subprocess failed with exit code %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2324"/>
<location filename="../widgets/mainwindow.cpp" line="2344"/>
<location filename="../widgets/mainwindow.cpp" line="2325"/>
<location filename="../widgets/mainwindow.cpp" line="2345"/>
<source>Running: %1
%2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2343"/>
<location filename="../widgets/mainwindow.cpp" line="2344"/>
<source>Subprocess error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2381"/>
<location filename="../widgets/mainwindow.cpp" line="2382"/>
<source>Reference spectrum saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2444"/>
<location filename="../widgets/mainwindow.cpp" line="2445"/>
<source>Invalid data in fmt.all at line %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2450"/>
<location filename="../widgets/mainwindow.cpp" line="2451"/>
<source>Good Calibration Solution</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2451"/>
<location filename="../widgets/mainwindow.cpp" line="2452"/>
<source>&lt;pre&gt;%1%L2 ±%L3 ppm
%4%L5 ±%L6 Hz
@ -3702,79 +3702,79 @@ list. The list can be maintained in Settings (F2).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2465"/>
<location filename="../widgets/mainwindow.cpp" line="2466"/>
<source>Delete Calibration Measurements</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2466"/>
<location filename="../widgets/mainwindow.cpp" line="2467"/>
<source>The &quot;fmt.all&quot; file will be renamed as &quot;fmt.bak&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2478"/>
<location filename="../widgets/mainwindow.cpp" line="2479"/>
<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-2019 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>
<location filename="../widgets/mainwindow.cpp" line="2749"/>
<location filename="../widgets/mainwindow.cpp" line="2750"/>
<source>No data read from disk. Wrong file format?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2756"/>
<location filename="../widgets/mainwindow.cpp" line="2757"/>
<source>Confirm Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2757"/>
<location filename="../widgets/mainwindow.cpp" line="2758"/>
<source>Are you sure you want to delete all *.wav and *.c2 files in &quot;%1&quot;?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2794"/>
<location filename="../widgets/mainwindow.cpp" line="2795"/>
<source>Keyboard Shortcuts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="2807"/>
<location filename="../widgets/mainwindow.cpp" line="2808"/>
<source>Special Mouse Commands</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="3117"/>
<location filename="../widgets/mainwindow.cpp" line="3118"/>
<source>No more files to open.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="3604"/>
<location filename="../widgets/mainwindow.cpp" line="3605"/>
<source>Please choose another Tx frequency. WSJT-X will not knowingly transmit another mode in the WSPR sub-band on 30m.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="3608"/>
<location filename="../widgets/mainwindow.cpp" line="3609"/>
<source>WSPR Guard Band</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="3621"/>
<location filename="../widgets/mainwindow.cpp" line="3622"/>
<source>Please choose another dial frequency. WSJT-X will not operate in Fox mode in the standard FT8 sub-bands.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="3625"/>
<location filename="../widgets/mainwindow.cpp" line="3626"/>
<source>Fox Mode warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="4215"/>
<location filename="../widgets/mainwindow.cpp" line="4216"/>
<source>Last Tx: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="4616"/>
<location filename="../widgets/mainwindow.cpp" line="4617"/>
<source>Should you switch to EU VHF Contest mode?
To do so, check &apos;Special operating activity&apos; and
@ -3782,181 +3782,181 @@ To do so, check &apos;Special operating activity&apos; and
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="4635"/>
<location filename="../widgets/mainwindow.cpp" line="4636"/>
<source>Should you switch to ARRL Field Day mode?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="4640"/>
<location filename="../widgets/mainwindow.cpp" line="4641"/>
<source>Should you switch to RTTY contest mode?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5367"/>
<location filename="../widgets/mainwindow.cpp" line="5386"/>
<location filename="../widgets/mainwindow.cpp" line="5399"/>
<location filename="../widgets/mainwindow.cpp" line="5425"/>
<location filename="../widgets/mainwindow.cpp" line="5368"/>
<location filename="../widgets/mainwindow.cpp" line="5387"/>
<location filename="../widgets/mainwindow.cpp" line="5400"/>
<location filename="../widgets/mainwindow.cpp" line="5426"/>
<source>Add to CALL3.TXT</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5368"/>
<location filename="../widgets/mainwindow.cpp" line="5369"/>
<source>Please enter a valid grid locator</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5387"/>
<location filename="../widgets/mainwindow.cpp" line="5388"/>
<source>Cannot open &quot;%1&quot; for read/write: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5423"/>
<location filename="../widgets/mainwindow.cpp" line="5424"/>
<source>%1
is already in CALL3.TXT, do you wish to replace it?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5599"/>
<location filename="../widgets/mainwindow.cpp" line="5600"/>
<source>Warning: DX Call field is empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5656"/>
<location filename="../widgets/mainwindow.cpp" line="5657"/>
<source>Log file error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5657"/>
<location filename="../widgets/mainwindow.cpp" line="5658"/>
<source>Cannot open &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5673"/>
<location filename="../widgets/mainwindow.cpp" line="5674"/>
<source>Error sending log to N1MM</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5674"/>
<location filename="../widgets/mainwindow.cpp" line="5675"/>
<source>Write returned &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5837"/>
<location filename="../widgets/mainwindow.cpp" line="5838"/>
<source>Stations calling DXpedition %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="5872"/>
<location filename="../widgets/mainwindow.cpp" line="5873"/>
<source>Hound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6212"/>
<location filename="../widgets/mainwindow.cpp" line="6213"/>
<source>Tx Messages</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6463"/>
<location filename="../widgets/mainwindow.cpp" line="6496"/>
<location filename="../widgets/mainwindow.cpp" line="6506"/>
<location filename="../widgets/mainwindow.cpp" line="6464"/>
<location filename="../widgets/mainwindow.cpp" line="6497"/>
<location filename="../widgets/mainwindow.cpp" line="6507"/>
<source>Confirm Erase</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6464"/>
<location filename="../widgets/mainwindow.cpp" line="6465"/>
<source>Are you sure you want to erase file ALL.TXT?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6474"/>
<location filename="../widgets/mainwindow.cpp" line="8220"/>
<location filename="../widgets/mainwindow.cpp" line="6475"/>
<location filename="../widgets/mainwindow.cpp" line="8221"/>
<source>Confirm Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6475"/>
<location filename="../widgets/mainwindow.cpp" line="6476"/>
<source>Are you sure you want to erase your contest log?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6476"/>
<location filename="../widgets/mainwindow.cpp" line="6477"/>
<source>Doing this will remove all QSO records for the current contest. They will be kept in the ADIF log file but will not be available for export in your Cabrillo log.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6489"/>
<location filename="../widgets/mainwindow.cpp" line="6490"/>
<source>Cabrillo Log saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6497"/>
<location filename="../widgets/mainwindow.cpp" line="6498"/>
<source>Are you sure you want to erase file wsjtx_log.adi?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6507"/>
<location filename="../widgets/mainwindow.cpp" line="6508"/>
<source>Are you sure you want to erase the WSPR hashtable?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="6601"/>
<location filename="../widgets/mainwindow.cpp" line="6602"/>
<source>VHF features warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7206"/>
<location filename="../widgets/mainwindow.cpp" line="7207"/>
<source>Tune digital gain </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7208"/>
<location filename="../widgets/mainwindow.cpp" line="7209"/>
<source>Transmit digital gain </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7227"/>
<location filename="../widgets/mainwindow.cpp" line="7228"/>
<source>Prefixes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7596"/>
<location filename="../widgets/mainwindow.cpp" line="7597"/>
<source>Network Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7597"/>
<location filename="../widgets/mainwindow.cpp" line="7598"/>
<source>Error: %1
UDP server %2:%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7745"/>
<location filename="../widgets/mainwindow.cpp" line="7746"/>
<source>File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7979"/>
<location filename="../widgets/mainwindow.cpp" line="7980"/>
<source>Phase Training Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="7982"/>
<location filename="../widgets/mainwindow.cpp" line="7983"/>
<source>Phase Training Enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="8116"/>
<location filename="../widgets/mainwindow.cpp" line="8117"/>
<source>WD:%1m</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="8178"/>
<location filename="../widgets/mainwindow.cpp" line="8858"/>
<location filename="../widgets/mainwindow.cpp" line="8179"/>
<location filename="../widgets/mainwindow.cpp" line="8859"/>
<source>Log File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/mainwindow.cpp" line="8221"/>
<location filename="../widgets/mainwindow.cpp" line="8222"/>
<source>Are you sure you want to clear the QSO queues?</source>
<translation type="unfinished"></translation>
</message>
@ -4114,7 +4114,7 @@ UDP server %2:%3</source>
<context>
<name>QObject</name>
<message>
<location filename="../main.cpp" line="335"/>
<location filename="../main.cpp" line="340"/>
<source>Invalid rig name - \ &amp; / not allowed</source>
<translation type="unfinished"></translation>
</message>
@ -6080,115 +6080,115 @@ Right click for insert and delete options.</source>
<context>
<name>main</name>
<message>
<location filename="../main.cpp" line="82"/>
<location filename="../main.cpp" line="551"/>
<location filename="../main.cpp" line="83"/>
<location filename="../main.cpp" line="563"/>
<source>Fatal error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="87"/>
<location filename="../main.cpp" line="556"/>
<location filename="../main.cpp" line="88"/>
<location filename="../main.cpp" line="568"/>
<source>Unexpected fatal error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="193"/>
<location filename="../main.cpp" line="194"/>
<source>Where &lt;rig-name&gt; is for multi-instance support.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="194"/>
<location filename="../main.cpp" line="195"/>
<source>rig-name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="199"/>
<location filename="../main.cpp" line="200"/>
<source>Where &lt;configuration&gt; is an existing one.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="200"/>
<location filename="../main.cpp" line="201"/>
<source>configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="205"/>
<location filename="../main.cpp" line="206"/>
<source>Where &lt;language&gt; is &lt;lang-code&gt;[-&lt;country-code&gt;].</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="206"/>
<location filename="../main.cpp" line="207"/>
<source>language</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="210"/>
<location filename="../main.cpp" line="211"/>
<source>Writable files in test location. Use with caution, for testing only.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="215"/>
<location filename="../main.cpp" line="216"/>
<source>Command line error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="222"/>
<location filename="../main.cpp" line="223"/>
<source>Command line help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="227"/>
<location filename="../main.cpp" line="228"/>
<source>Application version</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="366"/>
<location filename="../main.cpp" line="371"/>
<source>Another instance may be running</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="367"/>
<location filename="../main.cpp" line="372"/>
<source>try to remove stale lock file?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="402"/>
<location filename="../main.cpp" line="414"/>
<source>Failed to create a temporary directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="403"/>
<location filename="../main.cpp" line="411"/>
<location filename="../main.cpp" line="415"/>
<location filename="../main.cpp" line="423"/>
<source>Path: &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="409"/>
<location filename="../main.cpp" line="421"/>
<source>Failed to create a usable temporary directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="410"/>
<location filename="../main.cpp" line="422"/>
<source>Another application may be locking the directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="443"/>
<location filename="../main.cpp" line="455"/>
<source>Failed to create data directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="444"/>
<location filename="../main.cpp" line="456"/>
<source>path: &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="499"/>
<location filename="../main.cpp" line="511"/>
<source>Shared memory error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="500"/>
<location filename="../main.cpp" line="512"/>
<source>Unable to create shared memory segment</source>
<translation type="unfinished"></translation>
</message>

708
translations/wsjtx_es.ts
View File

File diff suppressed because it is too large Load Diff

2830
translations/wsjtx_ja.ts
View File

File diff suppressed because it is too large Load Diff

6304
translations/wsjtx_zh.ts Normal file
View File

File diff suppressed because it is too large Load Diff

6304
translations/wsjtx_zh_HK.ts Normal file
View File

File diff suppressed because it is too large Load Diff

7
widgets/displaytext.cpp
View File

@ -608,9 +608,12 @@ void DisplayText::highlight_callsign (QString const& callsign, QColor const& bg,
}
}
}
else if (pos != highlighted_calls_.end ())
else
{
highlighted_calls_.erase (pos);
if (pos != highlighted_calls_.end ())
{
highlighted_calls_.erase (pos);
}
QTextCursor cursor {document ()};
while (!cursor.isNull ())
{

19
widgets/mainwindow.cpp
View File

@ -996,14 +996,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message ()
{
MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X 2.2.0 made\n"
"available for testing purposes. By design it will\n"
"be nonfunctional after 0000 UTC on June 10, 2020.");
auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2020, 6, 10}, {0, 0}, Qt::UTC}) {
Q_EMIT finished ();
}
// MessageBox::critical_message (this,
// "This is a pre-release version of WSJT-X 2.2.0 made\n"
// "available for testing purposes. By design it will\n"
// "be nonfunctional after 0000 UTC on June 10, 2020.");
// auto now = QDateTime::currentDateTimeUtc ();
// if (now >= QDateTime {{2020, 6, 10}, {0, 0}, Qt::UTC}) {
// Q_EMIT finished ();
// }
}
void MainWindow::initialize_fonts ()
@ -3137,6 +3137,7 @@ void MainWindow::readFromStdout() //readFromStdout
if(line_read.indexOf("<DecodeFinished>") >= 0) {
m_bDecoded = line_read.mid(20).trimmed().toInt() > 0;
if(m_nDecodes==0) ndecodes_label.setText("0");
decodeDone ();
return;
} else {
@ -8829,7 +8830,7 @@ void MainWindow::write_all(QString txRx, QString message)
auto time = QDateTime::currentDateTimeUtc ();
if( txRx=="Rx" ) {
double tdec = fmod(double(time.time().second()),m_TRperiod);
if( tdec < 0.5*m_TRperiod ) {
if( "MSK144" != m_mode && tdec < 0.5*m_TRperiod ) {
tdec+=m_TRperiod;
}
time = time.addSecs(-tdec);

8
widgets/mainwindow.ui
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow">
@ -2911,6 +2911,9 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text">
<string>About WSJT-X</string>
</property>
<property name="menuRole">
<enum>QAction::AboutRole</enum>
</property>
</action>
<action name="actionWide_Waterfall">
<property name="text">
@ -3198,6 +3201,9 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text">
<string>Settings...</string>
</property>
<property name="menuRole">
<enum>QAction::PreferencesRole</enum>
</property>
</action>
<action name="actionLocal_User_Guide">
<property name="text">