diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index f165d19..6762750 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -78,9 +78,7 @@ AddRouteDialog::AddRouteDialog (Session & s)
 	set_skip_taskbar_hint (true);
 	set_resizable (false);
 
-	WindowTitle title(Glib::get_application_name());
-	title += _("Add Route");
-	set_title(title.get_string());
+	set_title (_("Add Track/Bus"));
 
 	name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
 	routes_spinner.set_name (X_("AddRouteDialogSpinner"));
diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index 9b34ae4..fbb4772 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -57,7 +57,7 @@ AnalysisWindow::AnalysisWindow() :
 	  fft_graph (16384)
 {
 	set_name(_("FFT analysis window"));
-	set_title(_("FFT analysis window"));
+	set_title (_("Spectral Analysis"));
 
 	track_list_ready = false;
 	
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index ea89b06..f571797 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1211,7 +1211,7 @@ ARDOUR_UI::open_session ()
 
 		/* ardour sessions are folders */
 
-		open_session_selector = new Gtk::FileChooserDialog (_("open session"), FILE_CHOOSER_ACTION_OPEN);
+		open_session_selector = new Gtk::FileChooserDialog (_("Open Session"), FILE_CHOOSER_ACTION_OPEN);
 		open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
 		open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
 		open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
@@ -1860,6 +1860,7 @@ ARDOUR_UI::snapshot_session ()
 
 	prompter.set_name ("Prompter");
 	prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+	prompter.set_title (_("Take Snapshot"));
 	prompter.set_prompt (_("Name of New Snapshot"));
 	prompter.set_initial_text (timebuf);
 	
@@ -1971,7 +1972,6 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 
 void
 ARDOUR_UI::save_template ()
-
 {
 	ArdourPrompter prompter (true);
 	string name;
@@ -1981,6 +1981,7 @@ ARDOUR_UI::save_template ()
 	}
 
 	prompter.set_name (X_("Prompter"));
+	prompter.set_title (_("Save Mix Template"));
 	prompter.set_prompt (_("Name for mix template:"));
 	prompter.set_initial_text(session->name() + _("-template"));
 	prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
@@ -2126,6 +2127,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 	
 	
 	msg.set_name (X_("CleanupDialog"));
+	msg.set_title (_("Cleanup Unused Sources"));
 	msg.set_wmclass (X_("existing_session"), "Ardour");
 	msg.set_position (Gtk::WIN_POS_MOUSE);
 	pop_back_splash ();
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index b827625..1346bd2 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -151,7 +151,7 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_action (main_actions, X_("Export"), _("Export"));
 	ActionManager::session_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Cleanup Unused Sources"),  mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup));
+	act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Cleanup Unused Sources..."),  mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup));
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (main_actions, X_("FlushWastebasket"), _("Flush Wastebasket"),  mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::flush_trash));
 	ActionManager::session_sensitive_actions.push_back (act);
@@ -213,7 +213,7 @@ ARDOUR_UI::install_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::register_action (common_actions, X_("About"), _("About"),  mem_fun(*this, &ARDOUR_UI::show_about));
 	ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this, &ARDOUR_UI::toggle_theme_manager));
-	ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Keybindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
+	ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Key Bindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
 	ActionManager::register_toggle_action (common_actions, X_("ToggleBundleManager"), _("Bundle Manager"), mem_fun(*this, &ARDOUR_UI::toggle_bundle_manager));
 
 	act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, (ARDOUR::RouteGroup *) 0, 1));
@@ -579,9 +579,7 @@ ARDOUR_UI::setup_clock ()
 	big_clock_window->set_border_width (0);
 	big_clock_window->add  (big_clock);
 
-	WindowTitle title(Glib::get_application_name());
-	title += _("Big Clock");
-	big_clock_window->set_title (title.get_string());
+	big_clock_window->set_title (_("Big Clock"));
 	big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
 	big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window,  (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 	big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index ba62d73..d12732a 100644
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -279,7 +279,7 @@ BundleEditor::on_map ()
 
 
 BundleManager::BundleManager (Session& session)
-	: ArdourDialog (_("Bundle manager")), _session (session), edit_button (_("Edit")), delete_button (_("Delete"))
+	: ArdourDialog (_("Bundle Manager")), _session (session), edit_button (_("Edit")), delete_button (_("Delete"))
 {
 	_list_model = Gtk::ListStore::create (_list_model_columns);
 	_tree_view.set_model (_list_model);
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 5aec061..11882ae 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3275,7 +3275,7 @@ Editor::duplicate_dialog (bool with_dialog)
 
 	if (with_dialog) {
 
-		ArdourDialog win ("Duplication Dialog");
+		ArdourDialog win ("Duplicate");
 		Label  label (_("Number of Duplications:"));
 		Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
 		SpinButton spinner (adjustment, 0.0, 1);
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 8459ccb..b0d916c 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -82,7 +82,7 @@ Editor::add_external_audio_action (ImportMode mode_hint)
 	}
 	
 	if (sfbrowser == 0) {
-		sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, 0, true, mode_hint);
+		sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), session, 0, true, mode_hint);
 	} else {
 		sfbrowser->set_mode (mode_hint);
 	}
@@ -115,7 +115,7 @@ Editor::external_audio_dialog ()
 	}
 
 	if (sfbrowser == 0) {
-		sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, track_cnt, true);
+		sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), session, track_cnt, true);
 	} else {
 		sfbrowser->reset (track_cnt);
 	}
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 4a7d861..1420021 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -26,7 +26,7 @@ using namespace Gdk;
 using namespace PBD;
 
 KeyEditor::KeyEditor ()
-	: ArdourDialog (_("Shortcut Editor"), false)
+	: ArdourDialog (_("Key Bindings"), false)
 	, unbind_button (_("Remove shortcut"))
 	, unbind_box (BUTTONBOX_END)
 	
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 7aeb8b3..9a63177 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -627,10 +627,7 @@ LocationUI::LocationUI ()
 {
 	i_am_the_modifier = 0;
 	
-	WindowTitle title(Glib::get_application_name());
-	title += _("Locations");
-
-	set_title(title.get_string());
+	set_title (_("Locations"));
 	set_wmclass(X_("ardour_locations"), "Ardour");
 
 	set_name ("LocationWindow");
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index fe3d59d..50d07d8 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -145,10 +145,7 @@ RouteParams_UI::RouteParams_UI ()
 	set_default_size (620,370);
 	set_wmclass (X_("ardour_route_parameters"), "Ardour");
 
-	WindowTitle title(Glib::get_application_name());
-	title += _("Track/Bus Inspector"); 
-	set_title (title.get_string());
-
+	set_title (_("Track/Bus Inspector"));
 
 	// events
 	route_display.get_selection()->signal_changed().connect(mem_fun(*this, &RouteParams_UI::route_selected));
diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index fefabf1..ab34b5c 100644
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -615,7 +615,7 @@ SessionMetadataDialog<DataSet>::init_people_data ()
 /* SessionMetadataEditor */
 
 SessionMetadataEditor::SessionMetadataEditor () :
-  SessionMetadataDialog<SessionMetadataSetEditable> (_("Edit session metadata"))
+  SessionMetadataDialog<SessionMetadataSetEditable> (_("Edit Session Metadata"))
 {
 
 }
diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 2770d6b..e8165a1 100644
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -33,7 +33,7 @@
 
 /** Construct Strip silence dialog box */
 StripSilenceDialog::StripSilenceDialog (std::list<boost::shared_ptr<ARDOUR::AudioRegion> > const & regions)
-	: ArdourDialog (_("Strip silence")), _wave_width (640), _wave_height (64)
+	: ArdourDialog (_("Strip Silence")), _wave_width (640), _wave_height (64)
 {
 	for (std::list<boost::shared_ptr<ARDOUR::AudioRegion> >::const_iterator i = regions.begin(); i != regions.end(); ++i) {
 
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 6b57458..ac0e054 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -54,9 +54,7 @@ ThemeManager::ThemeManager()
 	light_button ("Light theme"),
 	reset_button ("Restore Defaults")
 {
-	Gtkmm2ext::WindowTitle title (Glib::get_application_name ());
-	title += _("Theme Manager");
-	set_title (title.get_string ());
+	set_title (_("Theme Manager"));
   
 	color_list = ListStore::create (columns);
 	color_display.set_model (color_list);