Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge...

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 3b3f32ac04a1b9e61566dbf327ff14e10d6467a0..424e59aee4c4b32965958550519431b79fe3ce8d 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1815,10 +1815,9 @@ 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 Ardour.\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\">",