summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-11-15 18:32:42 +0000
committerCarl Hetherington <carl@carlh.net>2011-11-15 18:32:42 +0000
commit9355226fdfe729830e91e7892666b1da5734be36 (patch)
treed185f57fe6989373ac0a10393f82bc7e9ef1cd74
parentf66b919e298c1c4e5f780942a1ed75e262a6ee96 (diff)
Use the word Remove consistently for the remove regions
action, instead of the word Delete in the menu item and Remove elsewhere. git-svn-id: svn://localhost/ardour2/branches/3.0@10622 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/editor_actions.cc2
-rw-r--r--gtk2_ardour/editor_regions.cc4
-rw-r--r--gtk2_ardour/editor_regions.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 2898ea966b..abf61f868b 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -583,7 +583,7 @@ Editor::register_actions ()
ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortBySourceFilesystem"), _("By Source Filesystem"),
sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), BySourceFileFS, false));
- ActionManager::register_action (rl_actions, X_("removeUnusedRegions"), _("Delete Unused"), sigc::mem_fun(*_regions, &EditorRegions::delete_unused_regions));
+ ActionManager::register_action (rl_actions, X_("removeUnusedRegions"), _("Remove Unused"), sigc::mem_fun (*_regions, &EditorRegions::remove_unused_regions));
/* the next two are duplicate items with different names for use in two different contexts */
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 22586e00b9..473997212a 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -409,7 +409,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
}
void
-EditorRegions::delete_unused_regions ()
+EditorRegions::remove_unused_regions ()
{
vector<string> choices;
string prompt;
@@ -1543,7 +1543,7 @@ EditorRegions::show_action () const
}
RefPtr<Action>
-EditorRegions::delete_unused_regions_action () const
+EditorRegions::remove_unused_regions_action () const
{
return ActionManager::get_action (X_("RegionList"), X_("removeUnusedRegions"));
}
diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h
index 6a37595bd3..3c54e7b2d5 100644
--- a/gtk2_ardour/editor_regions.h
+++ b/gtk2_ardour/editor_regions.h
@@ -68,7 +68,7 @@ public:
_display.get_selection()->unselect_all ();
}
- void delete_unused_regions();
+ void remove_unused_regions ();
XMLNode& get_state () const;
void set_state (const XMLNode &);
@@ -182,7 +182,7 @@ private:
Glib::RefPtr<Gtk::Action> hide_action () const;
Glib::RefPtr<Gtk::Action> show_action () const;
- Glib::RefPtr<Gtk::Action> delete_unused_regions_action() const;
+ Glib::RefPtr<Gtk::Action> remove_unused_regions_action () const;
Glib::RefPtr<Gtk::ToggleAction> toggle_full_action () const;
Glib::RefPtr<Gtk::ToggleAction> toggle_show_auto_regions_action () const;