use "VCA" rather than "Control Master" in the GUI

diff --git a/gtk2_ardour/control_slave_ui.cc b/gtk2_ardour/control_slave_ui.cc
index 9ea6136e5f29fe36cf263af977742d58d53d7307..235a568a5414808ed95703efb8d1bb641e52912e 100644 (file)
--- a/gtk2_ardour/control_slave_ui.cc
+++ b/gtk2_ardour/control_slave_ui.cc
@@ -47,7 +47,7 @@ ControlSlaveUI::ControlSlaveUI (Session* s)
 {
        set_no_show_all (true);
 
-       Gtkmm2ext::UI::instance()->set_tip (*this, _("Control Masters"));
+       Gtkmm2ext::UI::instance()->set_tip (*this, _("VCAs"));
 
        initial_button.set_no_show_all (true);
        initial_button.set_name (X_("vca assign"));

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 9d10a442d43a3523b1f486edc6acab84a8c75563..28677aaffc4fc2c25943eb953f510012e8c68ed8 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -362,7 +362,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
                        f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g, true)));
                }
-               items.push_back (MenuElem (_("Assign Group to Control Master..."), *vca_menu));
+               items.push_back (MenuElem (_("Assign Group to VCA..."), *vca_menu));
 
 
                items.push_back (SeparatorElem());
@@ -398,7 +398,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                }
        }
 
-       items.push_back (MenuElem (_("Assign Selection to Control Master..."), *vca_menu));
+       items.push_back (MenuElem (_("Assign Selection to VCA..."), *vca_menu));
 
        vca_menu = new Menu;
        {
@@ -409,7 +409,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                }
 
        }
-       items.push_back (MenuElem (_("Assign Record Enabled to Control Master..."), *vca_menu));
+       items.push_back (MenuElem (_("Assign Record Enabled to VCA..."), *vca_menu));
 
        vca_menu = new Menu;
        {
@@ -420,7 +420,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                }
 
        }
-       items.push_back (MenuElem (_("Assign Soloed to Control Master..."), *vca_menu));
+       items.push_back (MenuElem (_("Assign Soloed to VCA..."), *vca_menu));
 
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Enable All Groups"), sigc::mem_fun(*this, &GroupTabs::activate_all)));