diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-19 23:44:53 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-19 23:44:53 -0500 |
| commit | 49d939777056bf388841298e28494dad100d868e (patch) | |
| tree | f0d6f1864b2dc82e70a28cdb762cb72362c7ceaa | |
| parent | 14b2d0b549d9b937a30b47a455156887e700a9bc (diff) | |
manually apply d697a31abf2fa1b0bedcab025188f03611920fdf from master (git could not apply cleanly)
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index fb79c4b4a0..05e88a44dc 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -2155,8 +2155,8 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) _suspend_menu_callbacks = true; add_level_meter_item_point (items, group, _("Input"), MeterInput); - add_level_meter_item_point (items, group, _("Pre-fader"), MeterPreFader); - add_level_meter_item_point (items, group, _("Post-fader"), MeterPostFader); + add_level_meter_item_point (items, group, _("Pre Fader"), MeterPreFader); + add_level_meter_item_point (items, group, _("Post Fader"), MeterPostFader); add_level_meter_item_point (items, group, _("Output"), MeterOutput); add_level_meter_item_point (items, group, _("Custom"), MeterCustom); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index c9d168026d..d3e34ddf33 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1237,13 +1237,13 @@ RouteUI::build_mute_menu(void) MenuList& items = mute_menu->items(); - pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader"))); + pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader Sends"))); init_mute_menu(MuteMaster::PreFader, pre_fader_mute_check); pre_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PreFader, pre_fader_mute_check)); items.push_back (CheckMenuElem(*pre_fader_mute_check)); pre_fader_mute_check->show_all(); - post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader"))); + post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader Sends"))); init_mute_menu(MuteMaster::PostFader, post_fader_mute_check); post_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PostFader, post_fader_mute_check)); items.push_back (CheckMenuElem(*post_fader_mute_check)); |