From 7cb7d83bb81cbb703b7b172ac73954a47247e3f1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 5 Apr 2022 19:26:01 +0200 Subject: [PATCH] Cont'd "meter/time-signature" disambiguation --- gtk2_ardour/editor_actions.cc | 2 +- gtk2_ardour/editor_tempodisplay.cc | 2 +- gtk2_ardour/tempo_dialog.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index cd76dce6e8..13c4870b9e 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -240,7 +240,7 @@ Editor::register_actions () reg_sens (editor_actions, "select-from-regions", _("Set Range to Selected Regions"), sigc::mem_fun(*this, &Editor::set_selection_from_region)); reg_sens (editor_actions, "edit-current-tempo", _("Edit Current Tempo"), sigc::mem_fun(*this, &Editor::edit_current_tempo)); - reg_sens (editor_actions, "edit-current-meter", _("Edit Current Meter"), sigc::mem_fun(*this, &Editor::edit_current_meter)); + reg_sens (editor_actions, "edit-current-meter", _("Edit Current Time Signature"), sigc::mem_fun(*this, &Editor::edit_current_meter)); reg_sens (editor_actions, "select-all-after-edit-cursor", _("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true, false)); reg_sens (editor_actions, "alternate-select-all-after-edit-cursor", _("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true, false)); diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index db8d2103ab..8c7b341067 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -703,7 +703,7 @@ Editor::edit_meter_section (Temporal::MeterPoint& section) reassociate_metric_markers (tmap); - begin_reversible_command (_("replace meter mark")); + begin_reversible_command (_("replace time signature mark")); XMLNode &before = tmap->get_state(); tmap->set_meter (meter, when); diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 37a7ebc4e7..52bce9eac5 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -703,7 +703,7 @@ MeterDialog::get_note_type () NoteTypes::iterator x = note_types.find (note_type.get_active_text()); if (x == note_types.end()) { - error << string_compose(_("incomprehensible meter note type (%1)"), note_type.get_active_text()) << endmsg; + error << string_compose(_("incomprehensible time signature denominator (%1)"), note_type.get_active_text()) << endmsg; return 0; } @@ -716,7 +716,7 @@ MeterDialog::get_lock_style () LockStyles::iterator x = lock_styles.find (lock_style.get_active_text()); if (x == lock_styles.end()) { - error << string_compose(_("incomprehensible meter lock style (%1)"), lock_style.get_active_text()) << endmsg; + error << string_compose(_("incomprehensible lock style (%1)"), lock_style.get_active_text()) << endmsg; return BeatTime; }