diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ee0e185c71..dee3ca7097 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -338,7 +338,7 @@ Editor::Editor () , timecode_label (_("Timecode")) , samples_label (_("Samples")) , tempo_label (_("Tempo")) - , meter_label (_("Meter")) + , meter_label (_("Time Signature")) , mark_label (_("Location Markers")) , range_mark_label (_("Range Markers")) , transport_mark_label (_("Loop/Punch Ranges")) diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 6f608d23dd..1d16ba2323 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -258,7 +258,7 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t) break; case MeterBarItem: - ruler_items.push_back (MenuElem (_("New Meter"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where))); + ruler_items.push_back (MenuElem (_("New Time Signature"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where))); break; case VideoBarItem: diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index d0105cf627..1ffd903ab2 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -92,9 +92,9 @@ MainClock::build_ops_menu () ops_items.push_back (SeparatorElem()); ops_items.push_back (MenuElem (_("Edit Tempo"), sigc::mem_fun(*this, &MainClock::edit_current_tempo))); - ops_items.push_back (MenuElem (_("Edit Meter"), sigc::mem_fun(*this, &MainClock::edit_current_meter))); + ops_items.push_back (MenuElem (_("Edit Time Signature"), sigc::mem_fun(*this, &MainClock::edit_current_meter))); ops_items.push_back (MenuElem (_("Insert Tempo Change"), sigc::mem_fun(*this, &MainClock::insert_new_tempo))); - ops_items.push_back (MenuElem (_("Insert Meter Change"), sigc::mem_fun(*this, &MainClock::insert_new_meter))); + ops_items.push_back (MenuElem (_("Insert Time Signature Change"), sigc::mem_fun(*this, &MainClock::insert_new_meter))); } timepos_t diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 4a023e38b6..37a7ebc4e7 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -487,7 +487,7 @@ TempoDialog::tap_tempo_focus_out (GdkEventFocus* ) } MeterDialog::MeterDialog (TempoMap::SharedPtr const & map, timepos_t const & pos, const string&) - : ArdourDialog (_("New Meter")) + : ArdourDialog (_("New Time Signature")) { Temporal::BBT_Time when (map->round_to_bar (map->bbt_at (pos))); Meter const & meter (map->meter_at (when)); @@ -496,7 +496,7 @@ MeterDialog::MeterDialog (TempoMap::SharedPtr const & map, timepos_t const & pos } MeterDialog::MeterDialog (Temporal::MeterPoint& section, const string&) - : ArdourDialog (_("Edit Meter")) + : ArdourDialog (_("Edit Time Signature")) { init (section.bbt(), section.divisions_per_bar(), section.note_value(), section.map().is_initial(section), section.map().time_domain()); } @@ -579,7 +579,7 @@ MeterDialog::init (const Temporal::BBT_Time& when, double bpb, double divisor, b when_bar_entry.set_alignment (1.0); if (!initial) { - Label* when_label = manage (new Label(_("Meter begins at bar:"), ALIGN_LEFT, ALIGN_CENTER)); + Label* when_label = manage (new Label(_("Time Signature begins at bar:"), ALIGN_LEFT, ALIGN_CENTER)); table->attach (*when_label, 0, 1, 2, 3, FILL | EXPAND, FILL | EXPAND); table->attach (when_bar_entry, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND);