X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.cc;h=d55a1aaf37a870ac0929aeff4bab57370d97b90a;hb=f2ceb5c3404bb3e7f4ccc5bb3f2236f593775d73;hp=b9712be19f0954ff714a5c9bf3e55d16c59c6742;hpb=8cff9049b1afe7b9b0fde26fb8b5f464287d7401;p=ardour.git

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index b9712be19f..d55a1aaf37 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -346,7 +346,7 @@ Editor::Editor ()
 	session_range_marker_menu = 0;
 	range_marker_menu = 0;
 	marker_menu_item = 0;
-	tm_marker_menu = 0;
+	tempo_or_meter_marker_menu = 0;
 	transport_marker_menu = 0;
 	new_transport_marker_menu = 0;
 	editor_mixer_strip_width = Wide;
@@ -547,7 +547,7 @@ Editor::Editor ()
 	nlabel = manage (new Label (_("Regions")));
 	nlabel->set_angle (-90);
 	the_notebook.append_page (_regions->widget (), *nlabel);
-	nlabel = manage (new Label (_("Tracks/Busses")));
+	nlabel = manage (new Label (_("Tracks & Busses")));
 	nlabel->set_angle (-90);
 	the_notebook.append_page (_routes->widget (), *nlabel);
 	nlabel = manage (new Label (_("Snapshots")));
@@ -1739,7 +1739,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
 		break;
 	}
 
-	bbt_glue_item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
+	bbt_glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_region_lock_style));
 
 	items.push_back (CheckMenuElem (_("Mute")));
 	CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
@@ -3879,7 +3879,7 @@ Editor::session_range_location_changed (Location* location)
 int
 Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
 {
-	ArdourDialog dialog ("playlist deletion dialog");
+	ArdourDialog dialog (_("Playlist Deletion"));
 	Label  label (string_compose (_("Playlist %1 is currently unused.\n"
 					"If left alone, no audio files used by it will be cleaned.\n"
 					"If deleted, audio files used by it alone by will cleaned."),