diff --git a/Configuration.cpp b/Configuration.cpp index 3100c0e02..c390b73ef 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -750,7 +750,7 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS ui_->frequencies_table_view->insertAction (nullptr, frequency_delete_action_); connect (frequency_delete_action_, &QAction::triggered, this, &Configuration::impl::delete_frequencies); - frequency_insert_action_ = new QAction {tr ("&Insert ..."), ui_->frequencies_table_view}; + frequency_insert_action_ = new QAction {tr ("&Insert"), ui_->frequencies_table_view}; ui_->frequencies_table_view->insertAction (nullptr, frequency_insert_action_); connect (frequency_insert_action_, &QAction::triggered, this, &Configuration::impl::insert_frequency); @@ -770,7 +770,7 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS ui_->stations_table_view->insertAction (nullptr, station_delete_action_); connect (station_delete_action_, &QAction::triggered, this, &Configuration::impl::delete_stations); - station_insert_action_ = new QAction {tr ("&Insert ..."), ui_->stations_table_view}; + station_insert_action_ = new QAction {tr ("&Insert"), ui_->stations_table_view}; ui_->stations_table_view->insertAction (nullptr, station_insert_action_); connect (station_insert_action_, &QAction::triggered, this, &Configuration::impl::insert_station); @@ -1147,10 +1147,9 @@ void Configuration::impl::set_rig_invariants () ui_->CAT_control_group_box->setEnabled (true); ui_->CAT_port_label->setText (tr ("Network Server:")); - ui_->CAT_port_combo_box->setToolTip (tr ("Optional hostname and port of network service\n" - "You can usually leave this blank\n" - "for a sensible default on this machine\n" - "formats:\n" + ui_->CAT_port_combo_box->setToolTip (tr ("Optional hostname and port of network service.\n" + "Leave blank for a sensible default on this machine.\n" + "Formats:\n" "\thostname:port\n" "\tIPv4-address:port\n" "\t[IPv6-address]:port")); diff --git a/Configuration.ui b/Configuration.ui index d80638e72..aa21c9881 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -211,7 +211,7 @@ - Behaviour + Behavior @@ -902,7 +902,7 @@ this setting allows you to select which audio input will be used - Poll Interval: + Poll Interval (s): CAT_poll_interval_spin_box @@ -1821,12 +1821,12 @@ soundcard changes - - - + + + diff --git a/WFPalette.cpp b/WFPalette.cpp index 9d638b5d3..258bf5305 100644 --- a/WFPalette.cpp +++ b/WFPalette.cpp @@ -129,10 +129,10 @@ namespace ui_.setupUi (this); // context menu actions - auto import_button = ui_.button_box->addButton ("&Import...", QDialogButtonBox::ActionRole); + auto import_button = ui_.button_box->addButton ("&Import", QDialogButtonBox::ActionRole); connect (import_button, &QPushButton::clicked, this, &Designer::import_palette); - auto export_button = ui_.button_box->addButton ("&Export...", QDialogButtonBox::ActionRole); + auto export_button = ui_.button_box->addButton ("&Export", QDialogButtonBox::ActionRole); connect (export_button, &QPushButton::clicked, this, &Designer::export_palette); // hookup the context menu handler @@ -203,7 +203,7 @@ namespace }); } - auto insert_action = context_menu_.addAction (tr ("&Insert ...")); + auto insert_action = context_menu_.addAction (tr ("&Insert")); connect (insert_action, &QAction::triggered, [this] () { auto item = ui_.colour_table_widget->itemAt (menu_pos_); @@ -211,7 +211,7 @@ namespace insert_new_item (row, QColor {0, 0, 0}); }); - auto insert_after_action = context_menu_.addAction (tr ("Insert &after ...")); + auto insert_after_action = context_menu_.addAction (tr ("Insert &after")); connect (insert_after_action, &QAction::triggered, [this] () { auto item = ui_.colour_table_widget->itemAt (menu_pos_); diff --git a/mainwindow.ui b/mainwindow.ui index 9a5b6ccef..2e69dec3f 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2681,7 +2681,7 @@ list. The list can be maintained in Settings (F2). - Settings ... + Configuration F2