X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_ui.cc;h=d3e34ddf33b63d6e8053b1e462b3bf4b0cb7c22d;hb=41c4c41eaa09a7d831988af828dd040499130bf1;hp=9494d42353d559b4d65e16c707c62bf2a704dbd7;hpb=8c5cff60912c7e0a7256f635641399500d8d00d9;p=ardour.git

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 9494d42353..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));
@@ -1692,7 +1692,7 @@ RouteUI::map_frozen ()
 void
 RouteUI::adjust_latency ()
 {
-	LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), _session->engine().frames_per_cycle());
+	LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
 }
 
 void
@@ -1815,15 +1815,15 @@ RouteUI::open_remote_control_id_dialog ()
 						       _route->remote_control_id(),
 						       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
 		} else {
-			l->set_markup (string_compose (_("The remote control ID of %6 is: %3\n\n\n"
-							 "Remote Control IDs are currently determined by track/bus ordering in %1\n\n"
-							 "%4Use the User Interaction tab of the Preferences window if you want to change this%5"),
-						       (Config->get_remote_model() == MixerOrdered ? _("the mixer") : _("the editor")),
+			l->set_markup (string_compose (_("The remote control ID of %5 is: %2\n\n\n"
+							 "Remote Control IDs are currently determined by track/bus ordering in %6.\n\n"
+							 "%3Use the User Interaction tab of the Preferences window if you want to change this%4"),
 						       (is_track() ? _("track") : _("bus")),
 						       _route->remote_control_id(),
 						       "<span size=\"small\" style=\"italic\">",
 						       "</span>",
-						       Glib::Markup::escape_text (_route->name())));
+						       Glib::Markup::escape_text (_route->name()),
+						       PROGRAM_NAME));
 		}
 		dialog.get_vbox()->pack_start (*l);
 		dialog.add_button (Stock::OK, RESPONSE_CANCEL);